debian/0000755000000000000000000000000012012531150007154 5ustar debian/source/0000755000000000000000000000000012012526332010462 5ustar debian/source/format0000644000000000000000000000001412012526332011670 0ustar 3.0 (quilt) debian/kanadic.menu0000644000000000000000000000201712012526332011442 0ustar ?package(kanadic):needs="X11" section="Games/Puzzles"\ title="Kata Drill" \ command="/usr/bin/kdrill -edictfile /usr/share/edict/kata.edic.gz -kdictfile none"\ icon="/usr/share/pixmaps/kdrill.xpm" ?package(kanadic):needs="X11" section="Games/Puzzles"\ title="Kata+ Drill" \ command="/usr/bin/kdrill -edictfile /usr/share/edict/kataplus.edic.gz -kdictfile none"\ icon="/usr/share/pixmaps/kdrill.xpm" ?package(kanadic):needs="X11" section="Games/Puzzles"\ title="Hira Drill" \ command="/usr/bin/kdrill -edictfile /usr/share/edict/hira.edic.gz -kdictfile none"\ icon="/usr/share/pixmaps/kdrill.xpm" ?package(kanadic):needs="X11" section="Games/Puzzles"\ title="Hira+ Drill" \ command="/usr/bin/kdrill -edictfile /usr/share/edict/hiraplus.edic.gz -kdictfile none"\ icon="/usr/share/pixmaps/kdrill.xpm" ?package(kanadic):needs="X11" section="Games/Puzzles"\ title="Full Kana+ Drill" \ command="/usr/bin/kdrill -edictfile /usr/share/edict/fullkatahira.edic.gz -kdictfile none"\ icon="/usr/share/pixmaps/kdrill.xpm" debian/patches/0000755000000000000000000000000012012526332010611 5ustar debian/patches/pointer-fixes.diff0000644000000000000000000001654712012526332014254 0ustar diff -ruN kdrill6.5-old/grades.c kdrill6.5/grades.c --- kdrill6.5-old/grades.c 2002-04-08 11:04:25.000000000 +0200 +++ kdrill6.5/grades.c 2008-04-28 14:10:57.000000000 +0200 @@ -11,6 +11,7 @@ #include #include #include +#include #include "defs.h" #include "externs.h" #include "game.h" @@ -98,9 +99,10 @@ char statusbuff[100]; char statusprefix[100]; int grademask; - grademask = 1 << (int) data; + int intdata = (int)(intptr_t) data; + grademask = 1 << intdata; - switch((int) data){ + switch(intdata){ case 1: case 2: case 3: case 4: case 5: case 6: @@ -124,8 +126,8 @@ } ReverseButton(w); - if((int) data <=6) - sprintf(statusprefix,"Grade %d unset: ",(int) data); + if(intdata <=6) + sprintf(statusprefix,"Grade %d unset: ",intdata); else sprintf(statusprefix,"Grade + unset: "); } @@ -134,8 +136,8 @@ /* nope.. turn on grade level */ ReverseButton(w); gradelevelflags |= grademask; - if((int) data <=6) - sprintf(statusprefix,"Grade %d set: ",(int) data); + if(intdata <=6) + sprintf(statusprefix,"Grade %d set: ",intdata); else sprintf(statusprefix,"Grade + set: "); } diff -ruN kdrill6.5-old/kanasearch.c kdrill6.5/kanasearch.c --- kdrill6.5-old/kanasearch.c 2004-01-26 07:57:17.000000000 +0100 +++ kdrill6.5/kanasearch.c 2008-04-28 14:04:45.000000000 +0200 @@ -227,8 +227,8 @@ { XChar2b CHAR; - CHAR.byte1 = ((int) data & 0xff00) >>8; - CHAR.byte2 = ((int) data & 0x00ff); + CHAR.byte1 = ((int)(intptr_t) data & 0xff00) >>8; + CHAR.byte2 = ((int)(intptr_t) data & 0x00ff); if(((CHAR.byte1 == 0x21) && (CHAR.byte2 == 0x21)) || CHAR.byte1 == 0) @@ -261,7 +261,7 @@ char romajibuff[MAXROMAJI+1]; int kcount; - if((int)data == 2){ + if((int)(intptr_t)data == 2){ /* toggle static variable */ popup_hirakana_mode = 1 - popup_hirakana_mode; @@ -369,7 +369,7 @@ std_translations[max_kana][0].byte2; XtAddCallback(kanawidgets[max_kana], XtNcallback, kanacallback, - (XtPointer) kvalue); + (XtPointer)(intptr_t) kvalue); max_kana++; } diff -ruN kdrill6.5-old/kanjisearch.c kdrill6.5/kanjisearch.c --- kdrill6.5-old/kanjisearch.c 2008-04-28 13:56:57.000000000 +0200 +++ kdrill6.5/kanjisearch.c 2008-04-28 14:07:24.000000000 +0200 @@ -60,7 +60,7 @@ int num; int kcount; - num = (int)data; + num = (intptr_t)data; for(kcount=0; kcount<4; kcount++){ if(num == kcount) @@ -82,7 +82,7 @@ return; } XtVaSetValues(kanjiquarters[quarter_up], - XtNlabel, quarterchars[(int)data], + XtNlabel, quarterchars[(int)(intptr_t)data], NULL); } @@ -199,7 +199,7 @@ } XtAddCallback(kanjiwidgets[kcount], XtNcallback, changequarter, - (XtPointer) kcount); + (XtPointer)(intptr_t) kcount); } XtVaSetValues(kanjiwidgets[10], @@ -285,7 +285,7 @@ for(kcount=0; kcount<4; kcount++){ XtAddCallback(kanjiquarters[kcount], XtNcallback, selectquarter, - (XtPointer) kcount); + (XtPointer)(intptr_t) kcount); } XtAddCallback(search, XtNcallback, DoKanjiFind, (XtPointer) NULL); diff -ruN kdrill6.5-old/learn.c kdrill6.5/learn.c --- kdrill6.5-old/learn.c 2003-08-23 08:48:53.000000000 +0200 +++ kdrill6.5/learn.c 2008-04-28 14:13:37.000000000 +0200 @@ -155,7 +155,7 @@ /* Okay, the 0xff is ugly: its to avoid an irritating size-of-int * warning in casting */ - showinorder=(Boolean)((int)client_data & 0xff); + showinorder=(Boolean)((int)(intptr_t)client_data & 0xff); nowshowing=picktruevalue(); showinorder=save_show; lastpicked=save_last; diff -ruN kdrill6.5-old/mainwindow.c kdrill6.5/mainwindow.c --- kdrill6.5-old/mainwindow.c 2003-08-23 08:26:10.000000000 +0200 +++ kdrill6.5/mainwindow.c 2008-04-28 14:11:29.000000000 +0200 @@ -12,6 +12,7 @@ #include #include #include +#include #include "defs.h" #include "game.h" @@ -63,7 +64,7 @@ * OR * [change kana<->english] */ - int buttonpressed = (int) data; + int buttonpressed = (int)(intptr_t) data; #ifdef DEBUG printf("button mode change: %d\n",buttonpressed); #endif @@ -96,7 +97,7 @@ */ void ChangeQuestion(Widget w,XtPointer data,XtPointer calldata) { - int buttonpressed = (int) data; + int buttonpressed = (int)(intptr_t) data; #ifdef DEBUG printf("changing question display\n"); @@ -170,6 +171,6 @@ */ void choicescallback(Widget w,XtPointer data,XtPointer calldata) { - guessvalue((int) data); + guessvalue((int)(intptr_t) data); } diff -ruN kdrill6.5-old/multikanji.c kdrill6.5/multikanji.c --- kdrill6.5-old/multikanji.c 2004-01-27 09:47:32.000000000 +0100 +++ kdrill6.5/multikanji.c 2008-04-28 14:05:51.000000000 +0200 @@ -204,7 +204,7 @@ * Parallel function to ToggleUsefile() */ void multiUcallback(Widget button, XtPointer data, XtPointer call_data){ - TRANSLATION trans=transptrs[(int)data]; + TRANSLATION trans=transptrs[(int)(intptr_t)data]; int kindex=trans_to_index(trans); SetUseKanji(kindex,!InUsefile(kindex)); @@ -276,7 +276,7 @@ XtNlabel,"u", NULL); - XtAddCallback(newu, XtNcallback, multiUcallback, (XtPointer)transcount); + XtAddCallback(newu, XtNcallback, multiUcallback, (XtPointer)(intptr_t)transcount); usefiletoggles[transcount]=newu; } diff -ruN kdrill6.5-old/options.c kdrill6.5/options.c --- kdrill6.5-old/options.c 2003-08-23 08:26:37.000000000 +0200 +++ kdrill6.5/options.c 2008-04-28 13:58:00.000000000 +0200 @@ -238,7 +238,7 @@ for(widgetcount=0;widgetcount<8;widgetcount++){ XtAddCallback(gradeButtons[widgetcount],XtNcallback, - GradeCallback,(XtPointer) widgetcount); + GradeCallback,(XtPointer)(intptr_t) widgetcount); } /* set labels properly */ printgrades(); diff -ruN kdrill6.5-old/skipsearch.c kdrill6.5/skipsearch.c --- kdrill6.5-old/skipsearch.c 2005-11-03 05:33:31.000000000 +0100 +++ kdrill6.5/skipsearch.c 2008-04-28 14:13:09.000000000 +0200 @@ -101,7 +101,7 @@ /* int shapenum=(int)client_data;*/ char newlabel[3]; - sprintf(newlabel,"%1d",(int)client_data); + sprintf(newlabel,"%1d",(int)(intptr_t)client_data); XtVaSetValues(SKIPnumberinput[1], XtNstring, newlabel, NULL); } @@ -114,7 +114,7 @@ void SKIPcallbacks(Widget w,XtPointer client_data, XtPointer call_data) { int scount; - int skipnum=(int)client_data; + int skipnum=(intptr_t)client_data; if(skipnum==10) { int s1,s2,s3; @@ -338,7 +338,7 @@ for(scount=0; scount<4; scount++) { XtAddCallback(SKIPcategories[scount], XtNcallback, SKIPcallbacks, - (XtPointer) scount); + (XtPointer)(intptr_t) scount); } XtAddCallback(SKIPshapeinput[0],XtNcallback, SKIPshapecallback, diff -ruN kdrill6.5-old/widgets.c kdrill6.5/widgets.c --- kdrill6.5-old/widgets.c 2006-03-05 23:08:58.000000000 +0100 +++ kdrill6.5/widgets.c 2008-04-28 13:59:10.000000000 +0200 @@ -506,7 +506,7 @@ XtAddEventHandler(choicesWidgets[i],ButtonPressMask,False, handle_button,NULL); XtAddCallback(choicesWidgets[i], - XtNcallback,choicescallback,(XtPointer) i); + XtNcallback,choicescallback,(XtPointer)(intptr_t) i); } XtManageChildren(choicesWidgets,NUMBEROFCHOICES); @@ -789,7 +789,7 @@ param+=1; int_store = (*param)-'0'; GradeCallback(gradeButtons[int_store], - (XtPointer) int_store,NULL); + (XtPointer)(intptr_t) int_store,NULL); break; case 'T': debian/patches/fix-edict-buffer-overflow.diff0000644000000000000000000000066512012526332016436 0ustar --- a/readfile.c +++ b/readfile.c @@ -533,6 +533,12 @@ /* Success! Set pointers appropriately */ newk->kdrill_index=nextindex; translations[nextindex++] = newk; + + if (nextindex >= MAXTRANSLATIONSALLOWED) { + fprintf(stderr, "Too many entries in the edict file. Some entries were not read."); + break; + } + if(lastk != NULL) { lastk->nextk = newk; debian/patches/drop-unused-variable.diff0000644000000000000000000000153112012526332015473 0ustar From: Chow Loong Jin Description: Drop unused uname variable in createallmulti() This fixes a buffer overflow due to an increase in MAXMULTI from 200 to 1000. Index: kdrill/multikanji.c =================================================================== --- kdrill.orig/multikanji.c 2012-04-19 19:10:54.203993261 +0800 +++ kdrill/multikanji.c 2012-04-19 19:11:12.214061826 +0800 @@ -233,7 +233,7 @@ Widget newbutton,newu; Widget prevbutton=NULL; int formwidth=GetWidgetWidth(multi_popup); - char buttname[10],uname[10]; + char buttname[10]; int transcount; @@ -244,7 +244,6 @@ for(transcount=0;transcount0){ /* we use this for XtNfromVert offset */ debian/patches/increase-maxmulti.diff0000644000000000000000000000267712012526332015106 0ustar From: wanderer at fastmail dot fm Subject: increase maximum search results to 1000 The search component of kdrill imposes a hard limit of 200 results to all kanji searches, and provides no way to get at any results beyond that limit. I have routinely needed to be able to look through all results, well past that limit. I am therefore running with the attached simple one-line patch, which raises the limit to 1000. I have not noticed any significant increase in e.g. memory requirements as a result. Bug-Debian: http://bugs.debian.org/645650 diff -Naur kdrill6.5-old//multikanji.c kdrill6.5//multikanji.c --- kdrill6.5-old//multikanji.c 2011-07-16 20:14:07.587370542 -0400 +++ kdrill6.5//multikanji.c 2011-07-16 20:16:48.871473678 -0400 @@ -53,7 +53,7 @@ /* MAXMULTI == max translation lines we will hold in multi-window */ /* If external routine wants to know this value, call getMultiMax() */ -#define MAXMULTI 200 +#define MAXMULTI 1000 debian/patches/clean-fixes.diff0000644000000000000000000000065512012526332013647 0ustar Index: kdrill/makedic/Makefile =================================================================== --- kdrill.orig/makedic/Makefile 2010-04-19 14:51:26.208200395 +0200 +++ kdrill/makedic/Makefile 2010-04-19 14:52:31.621527209 +0200 @@ -28,7 +28,7 @@ kdics: $(KDICS) clean: - rm makeedict makedic + rm -f makeedict makedic fullkatahira.edic: hiraplus.edic kataplus.edic cat hiraplus.edic kataplus.edic >fullkatahira.edic debian/patches/series0000644000000000000000000000037612012526332012034 0ustar manpages-fixes.diff implicit-exit-fix.diff pointer-fixes.diff search-segfault-fix.diff timeout-miss.diff clean-fixes.diff fix-edict-buffer-overflow.diff more-MAXTRANSLATIONSALLOWED.diff increase-maxmulti.diff drop-unused-variable.diff fix-double-zu.diff debian/patches/manpages-fixes.diff0000644000000000000000000000224112012526332014351 0ustar diff -ruN kdrill6.5-old/kdrill.man kdrill6.5/kdrill.man --- kdrill6.5-old/kdrill.man 2003-08-20 10:36:45.000000000 +0200 +++ kdrill6.5/kdrill.man 2008-04-23 13:52:38.000000000 +0200 @@ -1,7 +1,7 @@ .\" kdrill.1 2003/08/21 -.TH KDRILL 1 " Auguest 21st, 2003" "Phil\'s Software" +.TH KDRILL 1x " August 21st, 2003" "Phil\'s Software" .SH NAME -kdrill v6.2 \- drill program for kanji chars under Xwindows +kdrill \- drill program for kanji chars under Xwindows (X11R5 or better is required to run) kdrill also does dictionary lookup @@ -91,10 +91,10 @@ \fBWARNING!\fR Normal operation is to ignore incomplete entries, and thereby enable switching from kana to english without changing the quiz kanji. Using this option will make kdrill move to another kanji if you -switch kana to English or vica versa. - \[: default behaviour currently loses 300 kanji, with the kanjidic +switch kana to English or vica versa. + [ default behaviour currently loses 300 kanji, with the kanjidic file I have currently. All characters with Frequency ratings have full -translations. \] +translations. ] .SH RESOURCES Kdrill now saves config options in $HOME/.kdrill, in X-resource format. debian/patches/implicit-exit-fix.diff0000644000000000000000000000225312012526332015012 0ustar diff -ruN kdrill6.5-old/kanjisearch.c kdrill6.5/kanjisearch.c --- kdrill6.5-old/kanjisearch.c 2004-01-26 07:57:27.000000000 +0100 +++ kdrill6.5/kanjisearch.c 2008-04-23 17:38:39.000000000 +0200 @@ -2,6 +2,7 @@ /* Actual searcing happens in search.c */ #include +#include #include #include diff -ruN kdrill6.5-old/makedic/makedic.c kdrill6.5/makedic/makedic.c --- kdrill6.5-old/makedic/makedic.c 2000-02-28 19:48:25.000000000 +0100 +++ kdrill6.5/makedic/makedic.c 2008-04-23 17:39:59.000000000 +0200 @@ -20,7 +20,7 @@ #include - +#include diff -ruN kdrill6.5-old/makedic/makeedict.c kdrill6.5/makedic/makeedict.c --- kdrill6.5-old/makedic/makeedict.c 1998-01-15 20:12:16.000000000 +0100 +++ kdrill6.5/makedic/makeedict.c 2008-04-23 17:39:39.000000000 +0200 @@ -6,7 +6,7 @@ #include - +#include diff -ruN kdrill6.5-old/radsearch.c kdrill6.5/radsearch.c --- kdrill6.5-old/radsearch.c 2004-01-26 07:53:58.000000000 +0100 +++ kdrill6.5/radsearch.c 2008-04-23 17:39:00.000000000 +0200 @@ -10,6 +10,7 @@ #include +#include #include #include debian/patches/more-MAXTRANSLATIONSALLOWED.diff0000644000000000000000000000055512012526332015707 0ustar --- a/defs.h +++ b/defs.h @@ -55,7 +55,7 @@ #define MINKANJIALLOWED 0x2000 #define MAXKANJIALLOWED 0x8000 /* start edict at this+1 */ /* Crud. edict actually overflowed when MAXTRANSLATIONS==0x18000 */ -#define MAXTRANSLATIONSALLOWED 0x30000 +#define MAXTRANSLATIONSALLOWED 0x40000 /* MAXRADICALS is the approximate number of radicals that we know of, that debian/patches/fix-double-zu.diff0000644000000000000000000000163112012526332014136 0ustar --- a/makedic/fullkatahira.edic +++ b/makedic/fullkatahira.edic @@ -28,7 +28,7 @@ [] /chi/ € [€] /ji(chi)/ Ā [Ā] /tsu/ -ŀ [ŀ] /zu/ +ŀ [ŀ] /du/ ƀ [ƀ] /te/ ǀ [ǀ] /de/ Ȁ [Ȁ] /to/ --- a/makedic/hiraplus.edic +++ b/makedic/hiraplus.edic @@ -28,7 +28,7 @@ [] /chi/ € [€] /ji(chi)/ Ā [Ā] /tsu/ -ŀ [ŀ] /zu/ +ŀ [ŀ] /du/ ƀ [ƀ] /te/ ǀ [ǀ] /de/ Ȁ [Ȁ] /to/ --- a/makedic/infile.hiraplus +++ b/makedic/infile.hiraplus @@ -62,7 +62,7 @@ 2444 tsu 2445 -zu +du 2446 te 2447 --- a/makedic/infile.kataplus +++ b/makedic/infile.kataplus @@ -62,7 +62,7 @@ 2544 TSU 2545 -ZU +DU 2546 TE 2547 --- a/makedic/kataplus.edic +++ b/makedic/kataplus.edic @@ -28,7 +28,7 @@ [] /CHI/ € [€] /JI(CHI)/ Ā [Ā] /TSU/ -ŀ [ŀ] /ZU/ +ŀ [ŀ] /DU/ ƀ [ƀ] /TE/ ǀ [ǀ] /DE/ Ȁ [Ȁ] /TO/ debian/patches/timeout-miss.diff0000644000000000000000000000330412012526332014102 0ustar Index: kdrill/game.c =================================================================== --- kdrill.orig/game.c 2005-01-08 07:49:05.000000000 +0100 +++ kdrill/game.c 2010-04-18 23:03:42.749660787 +0200 @@ -379,7 +379,8 @@ { TRANSLATION kanjiP; - kanjiP = values[guess];/* for setting "incorrect" flag */ + if (guess != -1) + kanjiP = values[guess];/* for setting "incorrect" flag */ totalguessed+=1; @@ -412,13 +413,15 @@ * once for the quiz meaning you missed, * and once for the incorrect kanji you thought it was */ - Beep(); - setstatus("Incorrect."); - - /* Note that markasmissed also increments numberincorrect, - * *IFF* needed - */ + if(guess != -1){ + /* Timeout already handles message */ + Beep(); + setstatus("Incorrect."); + + /* Note that markasmissed also increments numberincorrect, + * *IFF* needed + */ markasmissed(kanjiP); } Index: kdrill/mainwindow.c =================================================================== --- kdrill.orig/mainwindow.c 2010-04-18 23:03:42.659656827 +0200 +++ kdrill/mainwindow.c 2010-04-18 23:03:42.762989932 +0200 @@ -122,7 +122,6 @@ * NOTE: * we get passed the value (key-1) */ -/* note that "-1" means "default due to time" */ void Guessvalue(Widget w,XEvent *event,String *params,Cardinal *num_parags) { int value; Index: kdrill/timeout.c =================================================================== --- kdrill.orig/timeout.c 2001-08-31 01:26:20.000000000 +0200 +++ kdrill/timeout.c 2010-04-18 23:03:42.762989932 +0200 @@ -149,6 +149,7 @@ void handletimeout(XtPointer closure, XtIntervalId *timerid){ Beep(); setstatus("TIME IS UP!"); + guessvalue(-1); cheatcallback(NULL, (XtPointer)1, NULL); in_use=0; debian/patches/search-segfault-fix.diff0000644000000000000000000000226612012526332015312 0ustar diff -ruN kdrill6.5-old/multikanji.c kdrill6.5/multikanji.c --- kdrill6.5-old/multikanji.c 2008-04-28 14:08:58.000000000 +0200 +++ kdrill6.5/multikanji.c 2008-04-28 14:09:38.000000000 +0200 @@ -205,6 +205,9 @@ */ void multiUcallback(Widget button, XtPointer data, XtPointer call_data){ TRANSLATION trans=transptrs[(int)(intptr_t)data]; + if (!trans) + return; + int kindex=trans_to_index(trans); SetUseKanji(kindex,!InUsefile(kindex)); diff -ruN kdrill6.5-old/searchwidgets.c kdrill6.5/searchwidgets.c --- kdrill6.5-old/searchwidgets.c 2006-03-05 22:38:12.000000000 +0100 +++ kdrill6.5/searchwidgets.c 2008-04-28 14:08:58.000000000 +0200 @@ -137,7 +137,8 @@ /* Find all matches for what is currently being displayed by the search win*/ void Handle_matchkanji(Widget w,XtPointer client_data, XtPointer call_data) { - findkanjiall(lastsearch->kanji); + if (lastsearch) + findkanjiall(lastsearch->kanji); } /* Handle toggle callback for "[usefile]" toggle button */ @@ -145,6 +146,9 @@ static void ToggleUsefile(Widget w,XtPointer client_data, XtPointer call_data) { + if (!lastsearch) + return; + int kcount=trans_to_index(lastsearch); SetUseKanji(kcount, !InUsefile(kcount)); debian/control0000644000000000000000000000277112012526332010574 0ustar Source: kdrill Section: education Priority: optional Maintainer: Євгеній Мещеряков Build-Depends: debhelper (>= 7.0.50), xutils-dev, libxaw7-dev, libx11-dev, libxt-dev, x11proto-core-dev Standards-Version: 3.9.3 Homepage: http://www.bolthole.com/kdrill/ Vcs-Git: git://git.debian.org/git/collab-maint/kdrill.git Vcs-Browser: http://git.debian.org/?p=collab-maint/kdrill.git Package: kdrill Section: education Architecture: any Recommends: kanadic | kanjidic (>= 2002.02.06-1), xfonts-base (>> 4.0) Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: edict, xjdic Description: kanji drill and dictionary program This package provides a graphical program for learning Japanese characters, which also doubles as a dictionary lookup program. It requires a dictionary package, such as kanjidic (for learning kanji) or kanadic (for learning hiragana or katakana), although you can specify a custom dictionary file on the command line. Package: makedic Section: text Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: dictionary compiler for KDrill This package provides a program to create custom dictionary files for KDrill. It can also generate kana dictionary drill files. Package: kanadic Section: education Architecture: all Depends: ${misc:Depends} Suggests: kdrill Description: katakana and hiragana drill files for KDrill This package provides files for practicing katakana and hiragana with KDrill. It includes basic and extended versions of each list. debian/kanadic.lintian-overrides0000644000000000000000000000167312012526332014143 0ustar kanadic: menu-command-not-in-package usr/share/menu/kanadic:4 usr/bin/kdrill kanadic: menu-command-not-in-package usr/share/menu/kanadic:8 usr/bin/kdrill kanadic: menu-command-not-in-package usr/share/menu/kanadic:12 usr/bin/kdrill kanadic: menu-command-not-in-package usr/share/menu/kanadic:16 usr/bin/kdrill kanadic: menu-command-not-in-package usr/share/menu/kanadic:20 usr/bin/kdrill kanadic: menu-icon-missing usr/share/pixmaps/kdrill.xpm kanadic: desktop-command-not-in-package usr/share/applications/kanadic-fullkatahira.desktop usr/bin/kdrill kanadic: desktop-command-not-in-package usr/share/applications/kanadic-hira.desktop usr/bin/kdrill kanadic: desktop-command-not-in-package usr/share/applications/kanadic-hiraplus.desktop usr/bin/kdrill kanadic: desktop-command-not-in-package usr/share/applications/kanadic-kata.desktop usr/bin/kdrill kanadic: desktop-command-not-in-package usr/share/applications/kanadic-kataplus.desktop usr/bin/kdrill debian/kanadic-fullkatahira.desktop0000644000000000000000000000032512012526332014614 0ustar [Desktop Entry] Name=Hira Drill Type=Application Icon=/usr/share/pixmaps/kdrill.xpm TryExec=/usr/bin/kdrill Exec=/usr/bin/kdrill -edictfile /usr/share/edict/hira.edic.gz -kdictfile none Categories=Game;LogicGame; debian/changelog0000644000000000000000000003070712012526332011043 0ustar kdrill (6.5deb2-9) unstable; urgency=low * Use romanization DU for ヅ and du for づ to avoid showing two entries for ZU and zu (closes: #684801). -- Євгеній Мещеряков Tue, 14 Aug 2012 21:52:12 +0200 kdrill (6.5deb2-8) unstable; urgency=low * Fix buffer overflow. Thanks to Chow Loong Jin (Closes: #669359). * Standards-Version 3.9.3 — no changes needed -- Євгеній Мещеряков Thu, 19 Apr 2012 22:20:58 +0200 kdrill (6.5deb2-7) unstable; urgency=low * Change sections of source, kdrill, and kanadic to 'education' -- Євгеній Мещеряков Sun, 04 Dec 2011 17:31:15 +0100 kdrill (6.5deb2-6) unstable; urgency=low * Add trailing semicolons in *.desktop files for Categories. Fixes KDE warnings. -- Євгеній Мещеряков Wed, 30 Nov 2011 17:11:49 +0100 kdrill (6.5deb2-5) unstable; urgency=low * New patch: - increase-maxmulti.diff — increase maximum number of kanji search results to 1000 (from 200, closes: #645650). -- Євгеній Мещеряков Wed, 19 Oct 2011 11:55:13 +0200 kdrill (6.5deb2-4) unstable; urgency=low * Rewrite package descriptions (thanks to Martin Eberhard Schauer and Justin B Rye, closes: #640326). -- Євгеній Мещеряков Sun, 04 Sep 2011 17:23:08 +0200 kdrill (6.5deb2-3) unstable; urgency=low * Fix buffer overflow with edict files with more than 163840 entries (closes: #632386) * Remove articles and capitalization at the beginnings of short decriptions * Fix lintian overrides file * Standards-Version 3.9.2 — no changes required * Add build-arch and build-indep targets * Extend allowed number of edict entries (by 0x10000) -- Євгеній Мещеряков Sun, 03 Jul 2011 19:29:13 +0200 kdrill (6.5deb2-2) unstable; urgency=low * Install everything under debian/tmp first to avoid FTBFS when building only arch packages * Add Vcs-* fields in debian/control -- Євгеній Мещеряков Mon, 19 Apr 2010 21:19:29 +0200 kdrill (6.5deb2-1) unstable; urgency=low * Repackage orig tarball in order to not use tarball-in-tarball scheme * Switch to source format 3.0 (quilt) * Do not use dbs (closes: #576052) * Remove generated files from orig tarball * Use dh overrides in debian/rules * Standards-Version 3.8.4 — no changes needed -- Євгеній Мещеряков Mon, 19 Apr 2010 16:24:50 +0200 kdrill (6.5dbs-4) unstable; urgency=low * New patches: - 11-timeout-miss - patch from Maurice Massar to count timeout as a miss (closes: #292305) * Add missing ${misc:Depends} * Standards-Version 3.8.3 - add 'patch' target * Use debhelper 7 and dh * Add lintian overrides for menu-command-not-in-package, menu-icon-missing and desktop-command-not-in-package in kanadic package * Add desktop file for kdrill * Change menu section for kdrill to Applications/Education * Add desktop files for kanadic -- Євгеній Мещеряков Mon, 17 Aug 2009 16:55:04 +0200 kdrill (6.5dbs-3) unstable; urgency=low * Fix typo s/--as-neede/--as-needed/ * New patches: - 02-implicit-exit-fix - fix incompatible implicit declaration of exit() - 03-pointer-fixes - fix warnings about pointer to int conversions - 10-search-segfault-fix - fix segfault when using search dialog * Add Homepage field -- Євгеній Мещеряков Mon, 28 Apr 2008 14:15:55 +0200 kdrill (6.5dbs-2) unstable; urgency=low * Clean directories before building, fixes some FTBFSes -- Євгеній Мещеряков Wed, 23 Apr 2008 15:27:15 +0200 kdrill (6.5dbs-1) unstable; urgency=low * New upstream release (closes: #438843) * New maintainer (closes: #465962) * Use dbs * Cleanup debian/rules and other files under debian/ * Debhelper compatibility level 6 * Standards-Version 3.7.3 * Fix unquoted strings in menu entries * Adjust debian/copyright * New patch: - 01-manpages-fixes - fix some errors reported by lintian * Fix spelling mistake in kanadic package description (closes: #363994) * Acknowledge NMUs (closes: #349174, #370267, #331876) * Build-depend on x11proto-core-dev instead of x-dev -- Євгеній Мещеряков Wed, 23 Apr 2008 15:06:38 +0200 kdrill (6.4-2.3) unstable; urgency=low * Non-maintainer upload. * cdebconf transition. Removed unnecessary cdebconf depends. Closes: #331876 -- Victor Seva Thu, 16 Nov 2006 10:46:29 +0100 kdrill (6.4-2.2) unstable; urgency=high * Non-maintainer upload. * High-urgency upload for RC bugfix. * Build-depend on xutils-dev for the X11R7 transition, and adjust the packaging to use the FHS paths. (Closes: #364247) -- Julien Danjou Fri, 19 May 2006 11:53:03 +0200 kdrill (6.4-2.1) unstable; urgency=low * Non-maintainer upload. * Replace build-dependency on xlibs-dev with an explicit build-dependency on each required package. (Closes: #346998) -- Steinar H. Gunderson Sat, 21 Jan 2006 13:48:00 +0100 kdrill (6.4-2) unstable; urgency=medium * This is a non-feature release. This is just to "unstick" the autobuilders -- Philip Brown Thu, 17 Mar 2005 15:32:11 -0500 kdrill (6.4-1) unstable; urgency=low * New upstream release * fixes upstream bug closing sub-windows * Updated README file Closes: #245553: debconf note related (note no longer needed) Closes: #245551: french translation, no longer needed Closes: #245060: japanese translation, no longer needed -- Philip Brown Sun, 9 Jan 2005 15:32:11 -0500 kdrill (6.3.1-1) unstable; urgency=low * New upstream release * Config script now *really* works (closes #167374) * Postinst for config script and dpkg * Depends on debconf (closes #167375) * Depends on libxaw7-dev (closes #169979) * Added in attempt to use po-debconf * Migrated pixmaps to new official location of /usr/share/pixmaps * Added spanish po translation to test the po-debconf usage contributed by Javier Fernandez-Sanguino Pen~a -- Philip Brown Wed, 18 Feb 2004 07:55:54 +0200 kdrill (6.2.1-1) unstable; urgency=low * New upstream release: * Improved radkfile loading * allow split-up of search string in kanji * improved radical search window -- Philip Brown Mon, 15 Sep 2003 07:55:54 +0200 kdrill (6.0-1) unstable; urgency=low * New upstream release * Adds 'radical' search method, using radkfile from xjdic Closes: #165131: kanjidic no longer gzipped in debian Closes: #166229: adjust depend on kanjidic package to be rev-specific -- Philip Brown Sat, 12 Oct 2002 02:01:02 -0400 kdrill (5.12.2-1) unstable; urgency=low * New upstream release * made cut-n-paste work under debian * added some extra search filtering -- Philip Brown Mon, 2 Sep 2002 08:00:10 +0200 kdrill (5.11.9-1) unstable; urgency=low * New upstream release * fixed default location of kanjidic Closes: #151849 -- Philip Brown Sun, 7 Jul 2002 05:43:46 +0200 kdrill (5.11.7-1) unstable; urgency=high * New upstream release Closes: #140364 (adds workaround for button gets stuck due to Xaw6 bug) * fixes romaji input bug(s) * cleaned up code arrangement a little -- Philip Brown Mon, 8 Apr 2002 00:20:16 -0400 kdrill (5.11.5-1) unstable; urgency=medium * New upstream release Closes: #121665 (BADCACHE array overflow) * Added timer option * Appearance of top level slightly changed, so that it behaves better for resizes. -- Philip Brown Mon, 3 Dec 2001 03:52:32 -0800 kdrill (5.11.2-1) unstable; urgency=low * New upstream release Closes: #109900 ('next' button in Learn window always random) -- Philip Brown Mon, 27 Aug 2001 08:39:05 -0700 kdrill (5.11.1-1) unstable; urgency=medium * New upstream release (add 'learn' window, +patch for ChangeMode()) Closes: #105972 -- Philip Brown Sat, 28 Jul 2001 12:25:05 -0700 kdrill (5.10-6) unstable; urgency=high * more debian-build-only changes. Completely rewrote rules file to match up with "rules.multi2" example for debhelper. This is to fix the kdrill binary not getting put in the package, after I turned "DH_COMPAT=3" back on. Closes: #93815 -- Philip Brown Sat, 14 Apr 2001 12:25:05 -0700 kdrill (5.10-5) unstable; urgency=high * No source changes, just debian stuff: * changed dist to unstable. * removed the old hardcoded app-defaults dir mentioned in 'dirs' * added a Build-Depends line to control * forced "export DH_COMPAT=3" in rules * changed xpm copy in rules to match new install tree structure under debian -- Philip Brown Sat, 18 Mar 2001 12:25:05 -0700 kdrill (5.10-4) testing; urgency=high change section for kdrill from "games" to "text" to be consistent. -- Philip Brown Tue, 20 Feb 2001 12:25:05 -0700 kdrill (5.10-3) unstable; urgency=high removing hardcode in 'rules' file to let Imake work for installing app-defaults files now urgency=high so that this will go in quickly for the freeze. -- Philip Brown Sat, 17 Feb 2001 12:25:05 -0700 kdrill (5.10-2) unstable; urgency=low Just a renumbering, to try to get debian releases sorted out with the binary re-compile I had to do. No actual change since 5.10-1 -- Philip Brown Sat, 05 Jan 2000 12:25:05 -0700 kdrill (5.10-1) frozen unstable; urgency=low * New upstream release (lots of small patches) -- Philip Brown Wed, 14 Aug 2000 15:25:05 -0700 kdrill (5.9.9-1) frozen unstable; urgency=medium * New upstream release (lots of small patches) * New maintainer (Upstream author, me) * My thanks go to Fabien for creating and maintaining the debian package until now -- Philip Brown Wed, 2 Aug 2000 15:25:05 -0700 kdrill (5.9.3-2) frozen unstable; urgency=low * On sparc, main should return 0 to exit properly. Elsewhere, it returns an error code. That's why it doesn't compile on sparc. (Closes: Bug#52688) -- Fabien Ninoles Sun, 23 Jan 2000 21:06:58 -0500 kdrill (5.9.3-1) unstable; urgency=low * New upstream version * Happy New Year everybody! -- Fabien Ninoles Tue, 11 Jan 2000 22:00:17 -0500 kdrill (5.9-1) unstable; urgency=low * New Upstream Version * Kanjidic are now compressed and move to /usr/share/edict. Thanks to Magnus for pointing me this. (Closes: 52688) * BTW, I move all kanji[kana] dictionnaries at the same place. -- Fabien Ninoles Thu, 16 Dec 1999 08:14:56 -0500 kdrill (5.8.beta1.5.9-1) unstable; urgency=low * Nouvelle version beta upstream. * Mostly an upstream release of the last fixes. -- Fabien Ninoles Sat, 30 Oct 1999 14:41:35 -0400 kdrill (5.8-5) unstable; urgency=low * Modify the description by request from the upstream author. -- Fabien Ninoles Thu, 21 Oct 1999 08:30:26 -0400 kdrill (5.8-4) unstable; urgency=low * From a suggestion of the author, augments the MAXTRANSLATIONALLOWED to 0x30000 to cope with edict size. -- Fabien Ninoles Sun, 17 Oct 1999 22:21:37 -0400 kdrill (5.8-3) unstable; urgency=low * FHS compliance of the package. -- Fabien Ninoles Thu, 9 Sep 1999 20:47:49 -0400 kdrill (5.8-2) unstable; urgency=low * Change the icon location in the menu file. Closes: #43884 -- Fabien Ninoles Wed, 1 Sep 1999 07:56:10 -0400 kdrill (5.8-1) unstable; urgency=low * a new version with bug fix on the skip search. * Move KDrill menu entry from Apps/Educational to Apps/Text * Upstream now include makedic and kanadic * Change in the licence allow now main, although their a suggest for non-free package edict. * Add kanjidic to kanadic. * Add menu entries for kanadic. * Add dependencies to kanji fonts (in the form of a Recommends so you can use your prefer one). -- Fabien Ninoles Sun, 27 Jun 1999 22:57:51 -0400 kdrill (4.0-1) unstable; urgency=low * Initial Release. -- Fabien Ninoles Sun, 4 Oct 1998 23:22:10 -0400 debian/kanadic.README.debian0000644000000000000000000000123112012526332012651 0ustar kanadic for DEBIAN ---------------------- Here are some edic and kanjidic dictionaries to learn your kana. katakana translations are in UPPERCASE, so they can be distinct from the hiragana translations. Menu entries also be added to load the different combinaisons from the Games/Puzzles sections, if the "kanadic" package is loaded. Often when start, you just have a Show kanji/Guess meaning defaults, which is not quite useful for this kind of drill. So, press the options button and choice Guess english. This will be saved in the configuration for the next time you start kdrill Have fun! Philip Brown Wed, 2 Aug 2000 15:25:05 -0700 debian/kanadic-hira.desktop0000644000000000000000000000033212012526332013066 0ustar [Desktop Entry] Name=Hira+ Drill Type=Application Icon=/usr/share/pixmaps/kdrill.xpm TryExec=/usr/bin/kdrill Exec=/usr/bin/kdrill -edictfile /usr/share/edict/hiraplus.edic.gz -kdictfile none Categories=Game;LogicGame; debian/kdrill.install0000644000000000000000000000015612012526332012035 0ustar usr/bin/kdrill etc usr/share/man/man1/kdrill* usr/share/pixmaps debian/kdrill.desktop usr/share/applications/ debian/kanadic.docs0000644000000000000000000000001712012526332011424 0ustar makedic/README debian/kanadic-hiraplus.desktop0000644000000000000000000000033212012526332013772 0ustar [Desktop Entry] Name=Kata+ Drill Type=Application Icon=/usr/share/pixmaps/kdrill.xpm TryExec=/usr/bin/kdrill Exec=/usr/bin/kdrill -edictfile /usr/share/edict/kataplus.edic.gz -kdictfile none Categories=Game;LogicGame; debian/kanadic-kata.desktop0000644000000000000000000000034312012526332013065 0ustar [Desktop Entry] Name=Full Kana+ Drill Type=Application Icon=/usr/share/pixmaps/kdrill.xpm TryExec=/usr/bin/kdrill Exec=/usr/bin/kdrill -edictfile /usr/share/edict/fullkatahira.edic.gz -kdictfile none Categories=Game;LogicGame; debian/kdrill.menu0000644000000000000000000000022212012526332011325 0ustar ?package(kdrill):needs="X11" section="Applications/Education"\ title="KDrill" command="/usr/bin/kdrill"\ icon="/usr/share/pixmaps/kdrill.xpm" debian/kanadic-kataplus.desktop0000644000000000000000000000032512012526332013771 0ustar [Desktop Entry] Name=Kata Drill Type=Application Icon=/usr/share/pixmaps/kdrill.xpm TryExec=/usr/bin/kdrill Exec=/usr/bin/kdrill -edictfile /usr/share/edict/kata.edic.gz -kdictfile none Categories=Game;LogicGame; debian/rules0000755000000000000000000000275612012526332010254 0ustar #!/usr/bin/make -f # This does not work #ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) # NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) # MAKEFLAGS += -j$(NUMJOBS) #endif SPECIALFLAGS=DICTLOCATION=/usr/share/edict/kanjidic EDICTLOCATION=/usr/share/edict/edict RADLOCATION=/var/lib/xjdic/radkfile PKGDIR=$(CURDIR)/debian/tmp # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 export LOCAL_LDFLAGS=-Wl,--as-needed override_dh_auto_configure: xmkmf -a override_dh_auto_build: $(MAKE) $(SPECIALFLAGS) $(MAKE) -C makedic override_dh_auto_test: # nothing override_dh_auto_clean: [ ! -f Makefile ] || make distclean rm -f KDrill.ad make -C makedic clean override_dh_auto_install: # kdrill $(MAKE) install DESTDIR=$(PKGDIR) $(SPECIALFLAGS) $(MAKE) install.man DESTDIR=$(PKGDIR) mkdir -p $(PKGDIR)/usr/share/pixmaps/ cp kdrill.xpm $(PKGDIR)/usr/share/pixmaps/ # makedic cp makedic/makeedict makedic/makedic $(PKGDIR)/usr/bin mkdir -p $(PKGDIR)/usr/share/man/man1 cp makedic/*.1 $(PKGDIR)/usr/share/man/man1 # kanadic mkdir -p $(PKGDIR)/usr/share/edict cp makedic/*.edic $(PKGDIR)/usr/share/edict gzip -9v $(PKGDIR)/usr/share/edict/*.edic build clean install build-arch build-indep binary-arch binary-indep binary: dh $@ .PHONY: build clean install build-arch build-indep binary-arch binary-indep binary .PHONY: override_dh_auto_configure override_dh_auto_build .PHONY: override_dh_auto_test override_dh_auto_clean .PHONY: override_dh_auto_install debian/README.Debian0000644000000000000000000000174012012526332011225 0ustar kdrill for Debian ---------------------- NOTE #1: The dictionaries for KDrill (and many other things) can be change as an XResource. The debian default is KDrill*kdictfile: /usr/share/edict/kanjidic KDrill*edictfile: /usr/share/edict/edict (The "upstream" default is in /usr/local/lib) Please also note, that very very old debian packages of kdrill, had the kanjidic file elsewhere. If you are upgrading from one of those ancient versions, you as a user may want to set your kdrill preferences to the right place, by running the following one time: kdrill -kdictfile /usr/share/edict/kanjidic NOTE #2: due to debian licensing policy, the kanjidic that ships with debian is MISSING 'SKIP' information. Therefore, you will not be able to use SKIP search, unless you update the debian kanjidic with the original one from your local monash mirror site. See http://www.bolthole.com/kdrill/ to find mirror sites -- Philip Brown , Sun, 9 Jan 2005 09:40:29 -0700 debian/watch0000644000000000000000000000024412012526332010213 0ustar # You can run the "uscan" command to check for upstream updates and more. # version=3 opts=dversionmangle=s/dbs$// http://www.bolthole.com/kdrill/kdrill(.*).tar.gz debian/copyright0000644000000000000000000000413412012526332011117 0ustar This package was first debianized by Fabien Ninoles fab@tzone.org on Sun, 4 Oct 1998 23:22:10 -0400. It is now maintained by Eugeniy Meshcheryakov It was maintained by Philip Brown in the past It was downloaded from http://www.bolthole.com/kdrill/ Upstream Author: Philip Brown Copyright: Sigh. the legal stuff just gets messier and messier. I, Philip Brown, am now writing my own license again. "The Program" in this document refers to kdrill, (c) 1991-2005 "{A/the} distribution" refers to the full contents of a tar file, or other archive, used by me to distribute the program from my ftp or web site. The overall purpose of this document is to declare: "This is MY program. I care about what happens to it. Don't mess me around or I'll sue your butt" Now on to the nice stuff. You, or anyone else, is free to use the program whenever, and however they like for themselves, for no charge. I make no warantee, implied or otherwise, as to the safety, bugfreeness, or anything else, of this program [etc, etc]. That being said, if you TELL ME about a bug, I'll try to fix it :-) REDISTRIBUTION: You may redistribute the program in any of the ways below, without charge: a) A binary-only compilation of an unmodified distribution from ftp.bolthole.com. Adjustments to the Imakefile, or X resource file are not considered modifications. You must provide a noticeable message that the full source code is on ftp.bolthole.com, and that I am the original author. b) Full source code [binaries optional] You may choose to provide source modifications, and binaries based on those modifications. However, the original program distribution must be present, in its entirety, unaltered, along with your files. c) A set of patches to an unmodified distribution. You do not have to provide the distribution, just a pointer to ftp.bolthole.com, and a notice that I am the original author. Philip Brown Wed, 2 Aug 2000 15:25:05 -0700 debian/docs0000644000000000000000000000002612012526332010033 0ustar README PATCHLIST TODO debian/makedic.docs0000644000000000000000000000001712012526332011427 0ustar makedic/README debian/kdrill.desktop0000644000000000000000000000020512012526332012033 0ustar [Desktop Entry] Name=KDrill Exec=/usr/bin/kdrill Type=Application Icon=/usr/share/pixmaps/kdrill.xpm Categories=Education;Languages; debian/kanadic.install0000644000000000000000000000010012012526332012133 0ustar usr/share/edict debian/kanadic-*.desktop usr/share/applications debian/compat0000644000000000000000000000000212012526332010360 0ustar 7 debian/makedic.install0000644000000000000000000000004712012526332012150 0ustar usr/bin/make* usr/share/man/man1/make*