--- gjiten-2.6.orig/debian/postrm +++ gjiten-2.6/debian/postrm @@ -0,0 +1,46 @@ +#!/bin/sh +# postrm script for #PACKAGE# +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + for dic in kanjidic edict compdic + do + if [ -f /usr/share/gjiten/dics/$dic ]; then + rm /usr/share/gjiten/dics/$dic + fi + done + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- gjiten-2.6.orig/debian/control +++ gjiten-2.6/debian/control @@ -1,16 +1,17 @@ Source: gjiten Section: gnome Priority: optional -Maintainer: Botond Botyanszki +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Botond Botyanszki Uploaders: Ludovic Drolez -Build-Depends: cdbs, debhelper (>> 4.2.0), libgnomeui-dev, scrollkeeper, libxml-parser-perl, libgnutls-dev, libgcrypt-dev, docbook-utils -Standards-Version: 3.6.2 +Build-Depends: cdbs, debhelper (>> 4.2.0), libgnomeui-dev, scrollkeeper, libxml-parser-perl, libgnutls-dev, libgcrypt-dev, docbook-utils, xmlto, libglade2-dev +Standards-Version: 3.8.0 Package: gjiten Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, kanjidic, edict Suggests: enamdict -Recommends: ttf-sazanami-mincho | ttf-kochi-mincho +Recommends: fonts-ipafont-mincho | fonts-japanese-mincho Description: Japanese dictionary for GNOME Gjiten is a Japanese dictionary for GNOME with advanced word and kanji lookup features. Requires dictionary files (edict, kanjidic) to function. --- gjiten-2.6.orig/debian/changelog +++ gjiten-2.6/debian/changelog @@ -1,8 +1,49 @@ +gjiten (2.6-2.2ubuntu1) quantal; urgency=low + + * Merge from Debian Unstable (LP: #1014317). Remaining Changes: + - src/conf.c: (LP: #272659) + Set gconf /apps/gjiten/general to /usr/bin/kanjipad by default. + + -- Vibhav Pant Sun, 17 Jun 2012 15:05:47 +0530 + +gjiten (2.6-2.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/postrm + - remove generated files for purge (Closes: #599597) + * debian/control + - set "Recommends: fonts-ipafont-mincho | fonts-japanese-mincho" + (Closes: #642942) + + -- Hideki Yamane Fri, 27 Jan 2012 12:47:10 +0900 + +gjiten (2.6-2.1ubuntu1) karmic; urgency=low + + * src/conf.c: (LP: #272659) + Set gconf /apps/gjiten/general to /usr/bin/kanjipad by default + + -- Mackenzie Morgan Tue, 20 Oct 2009 02:24:15 -0400 + +gjiten (2.6-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add missing Build-Depends on libglade2-dev. (Closes: #529766) + + -- Chris Lamb Sat, 08 Aug 2009 15:52:37 +0100 + +gjiten (2.6-2) unstable; urgency=low + + * patch to fix a gjiten segfault on specific sequence. Closes: #445042 + * menu file fixed + + -- Ludovic Drolez Mon, 16 Jun 2008 19:51:14 +0200 + gjiten (2.6-1) unstable; urgency=low * New upstream release. See ChangeLog. Closes: Bug#314089 + * Added a missing build depend: xmlto - -- Botond Botyanszki Sun, 29 Oct 2006 19:11:24 +0200 + -- Ludovic Drolez Sun, 29 Oct 2006 19:11:24 +0200 gjiten (2.5-1) unstable; urgency=low @@ -96,6 +137,3 @@ -- Botond Botyanszki Sat, 14 Apr 2001 18:13:29 +0900 -Local variables: -mode: debian-changelog -End: --- gjiten-2.6.orig/debian/menu +++ gjiten-2.6/debian/menu @@ -1,3 +1,3 @@ -?package(gjiten):needs="X11" section="Apps/Text" \ +?package(gjiten):needs="X11" section="Applications/Text" \ title="Gjiten" command="/usr/bin/gjiten" --- gjiten-2.6.orig/src/worddic.c +++ gjiten-2.6/src/worddic.c @@ -781,6 +781,7 @@ if (GTK_IS_WIDGET(wordDic->window) == TRUE) gtk_widget_destroy(wordDic->window); g_free(wordDic); //FIXME: clear combo_entry_glist + current_glist_word = NULL; wordDic = NULL; gjitenApp->worddic = NULL; } --- gjiten-2.6.orig/src/conf.c +++ gjiten-2.6/src/conf.c @@ -111,7 +111,7 @@ conf->kanjipad = gconf_client_get_string(gconf_client, "/apps/gjiten/general/kanjipad", NULL); - if (conf->kanjipad == NULL) conf->kanjipad = ""; + if (conf->kanjipad == NULL) conf->kanjipad = "/usr/bin/kanjipad"; conf->numofdics = gconf_client_get_int(gconf_client, "/apps/gjiten/general/numofdics", NULL); @@ -259,6 +259,7 @@ gconf_client_set_bool(gconf_client, "/apps/gjiten/general/autoadjust_enabled", conf->autoadjust_enabled, NULL); gconf_client_set_bool(gconf_client, "/apps/gjiten/general/searchlimit_enabled", conf->searchlimit_enabled, NULL); gconf_client_set_int(gconf_client, "/apps/gjiten/general/maxwordmatches", conf->maxwordmatches, NULL); + gconf_client_set_string(gconf_client, "/apps/gjiten/general/kanjipad", conf->kanjipad, NULL); } gboolean conf_init_handler() { --- gjiten-2.6.orig/help/gjiten.1 +++ gjiten-2.6/help/gjiten.1 @@ -49,7 +49,6 @@ \fB\-\-version\fR Prints the version of gjiten -.PB .SH BUGS See the BUGS file for a list of bugs. The TODO file is more likely to contain these. Please contact me if you encounter any bugs.