Attached to this mail is the patch with the differences between Philip's 6.3.1-1 version and the 6.3.1-1.1 version I've just uploaded. Since this is an NMU, the bugs fixed by the previous version (#167374, #167375 and #169979) should now be closed manually (#221831 should be closed too in this batch probably) Notice that I've just fixed some lintian errors/warnings and added a translation in this NMU. In my local tests it works as expected, so all should be fine now. Regards Javi
diff -Nru kdrill-6.3.1.pbrown/Makefile kdrill-6.3.1/Makefile
--- kdrill-6.3.1.pbrown/Makefile 2004-02-18 00:13:38.000000000 +0100
+++ kdrill-6.3.1/Makefile 2004-02-18 00:51:52.000000000 +0100
@@ -2,7 +2,7 @@
# $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $
# ----------------------------------------------------------------------
-# Makefile generated from "Imake.tmpl" and </tmp/IIf.dboGOn>
+# Makefile generated from "Imake.tmpl" and </tmp/IIf.dHVRhh>
# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
#
#
@@ -40,7 +40,7 @@
# platform: $XFree86: xc/config/cf/linux.cf,v 3.175.2.1 2002/09/04 02:38:08 dawes Exp $
-# operating system: Linux 2.2.17 i586 [ELF] (2.2.17)
+# operating system: Linux 2.4.22-1-686 i686 [ELF] (2.4.22)
# libc: (6.3.2)
# binutils: (214)
diff -Nru kdrill-6.3.1.pbrown/debian/changelog kdrill-6.3.1/debian/changelog
--- kdrill-6.3.1.pbrown/debian/changelog 2004-02-18 00:13:38.000000000 +0100
+++ kdrill-6.3.1/debian/changelog 2004-02-18 00:50:58.000000000 +0100
@@ -1,3 +1,14 @@
+kdrill (6.3.1-1.1) unstable; urgency=low
+
+ * NMU (approved)
+ - Fixed lintian warning (boilerplate in debian/copyright)
+ - Added spanish po translation to test the po-debconf usage
+ - Removed example file from debian/ directory (ex.doc-base-package)
+ - Installed pixmaps to /usr/share/pixmaps (where they should be)
+ and modified the menu files appropiately
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org> Wed, 18 Feb 2004 00:18:44 +0100
+
kdrill (6.3.1-1) unstable; urgency=low
* New upstream release
diff -Nru kdrill-6.3.1.pbrown/debian/control kdrill-6.3.1/debian/control
--- kdrill-6.3.1.pbrown/debian/control 2004-02-18 00:13:38.000000000 +0100
+++ kdrill-6.3.1/debian/control 2004-02-18 00:41:53.000000000 +0100
@@ -9,7 +9,7 @@
Section: text
Architecture: any
Recommends: kanadic | kanjidic (>= 2002.02.06-1), xfonts-base (>> 4.0)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf
Suggests: edict, xjdic
Description: A Kanji drill and dictionary program
Offers lot of options like guessing kanji, guessing meaning, by grade
diff -Nru kdrill-6.3.1.pbrown/debian/copyright kdrill-6.3.1/debian/copyright
--- kdrill-6.3.1.pbrown/debian/copyright 2004-02-18 00:13:38.000000000 +0100
+++ kdrill-6.3.1/debian/copyright 2004-02-18 00:20:00.000000000 +0100
@@ -4,7 +4,7 @@
It was downloaded from ftp://ftp.bolthole.com/kdrill/
-Upstream Author(s): Philip Brown <phil@bolthole.com>
+Upstream Author: Philip Brown <phil@bolthole.com>
Copyright:
diff -Nru kdrill-6.3.1.pbrown/debian/dirs kdrill-6.3.1/debian/dirs
--- kdrill-6.3.1.pbrown/debian/dirs 2004-02-18 00:13:38.000000000 +0100
+++ kdrill-6.3.1/debian/dirs 2004-02-18 00:47:46.000000000 +0100
@@ -1,3 +1,3 @@
usr/X11R6/bin
-usr/X11R6/include/X11/pixmaps
-
+usr/share/pixmaps
+etc/X11/app-defaults/
diff -Nru kdrill-6.3.1.pbrown/debian/ex.doc-base.package kdrill-6.3.1/debian/ex.doc-base.package
--- kdrill-6.3.1.pbrown/debian/ex.doc-base.package 2004-02-18 00:13:38.000000000 +0100
+++ kdrill-6.3.1/debian/ex.doc-base.package 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-Document: kdrill
-Title: Debian kdrill Manual
-Author: <insert document author here>
-Abstract: This manual describes what kdrill is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/doc/kdrill/kdrill.sgml.gz
-
-Format: postscript
-Files: /usr/doc/kdrill/kdrill.ps.gz
-
-Format: text
-Files: /usr/doc/kdrill/kdrill.text.gz
-
-Format: HTML
-Index: /usr/doc/kdrill/html/index.html
-Files: /usr/doc/kdrill/html/*.html
-
-
diff -Nru kdrill-6.3.1.pbrown/debian/kanadic.dirs kdrill-6.3.1/debian/kanadic.dirs
--- kdrill-6.3.1.pbrown/debian/kanadic.dirs 2004-02-18 00:13:38.000000000 +0100
+++ kdrill-6.3.1/debian/kanadic.dirs 2004-02-18 00:48:12.000000000 +0100
@@ -1 +1,2 @@
usr/share/edict
+usr/share/pixmaps
diff -Nru kdrill-6.3.1.pbrown/debian/kanadic.menu kdrill-6.3.1/debian/kanadic.menu
--- kdrill-6.3.1.pbrown/debian/kanadic.menu 2004-02-18 00:13:38.000000000 +0100
+++ kdrill-6.3.1/debian/kanadic.menu 2004-02-18 00:48:40.000000000 +0100
@@ -1,20 +1,20 @@
?package(kanadic):needs=X11 section=Games/Puzzles\
title="Kata Drill" \
command="/usr/X11R6/bin/kdrill -edictfile /usr/share/edict/kata.edic.gz -kdictfile none"\
- icon="/usr/X11R6/include/X11/pixmaps/kdrill.xpm"
+ icon="/usr/share/pixmaps/kanadic.xpm"
?package(kanadic):needs=X11 section=Games/Puzzles\
title="Kata+ Drill" \
command="/usr/X11R6/bin/kdrill -edictfile /usr/share/edict/kataplus.edic.gz -kdictfile none"\
- icon="/usr/X11R6/include/X11/pixmaps/kdrill.xpm"
+ icon="/usr/share/pixmaps/kanadic.xpm"
?package(kanadic):needs=X11 section=Games/Puzzles\
title="Hira Drill" \
command="/usr/X11R6/bin/kdrill -edictfile /usr/share/edict/hira.edic.gz -kdictfile none"\
- icon="/usr/X11R6/include/X11/pixmaps/kdrill.xpm"
+ icon="/usr/share/pixmaps/kanadic.xpm"
?package(kanadic):needs=X11 section=Games/Puzzles\
title="Hira+ Drill" \
command="/usr/X11R6/bin/kdrill -edictfile /usr/share/edict/hiraplus.edic.gz -kdictfile none"\
- icon="/usr/X11R6/include/X11/pixmaps/kdrill.xpm"
+ icon="/usr/share/pixmaps/kanadic.xpm"
?package(kanadic):needs=X11 section=Games/Puzzles\
title="Full Kana+ Drill" \
command="/usr/X11R6/bin/kdrill -edictfile /usr/share/edict/fullkatahira.edic.gz -kdictfile none"\
- icon="/usr/X11R6/include/X11/pixmaps/kdrill.xpm"
+ icon="/usr/share/pixmaps/kanadic.xpm"
diff -Nru kdrill-6.3.1.pbrown/debian/menu kdrill-6.3.1/debian/menu
--- kdrill-6.3.1.pbrown/debian/menu 2004-02-18 00:13:38.000000000 +0100
+++ kdrill-6.3.1/debian/menu 2004-02-18 00:50:02.000000000 +0100
@@ -1,3 +1,3 @@
?package(kdrill):needs=X11 section=Apps/Text\
title="KDrill" command="/usr/X11R6/bin/kdrill"\
- icon="/usr/X11R6/include/X11/pixmaps/kdrill.xpm"
+ icon="/usr/share/pixmaps/kdrill.xpm"
diff -Nru kdrill-6.3.1.pbrown/debian/po/es.po kdrill-6.3.1/debian/po/es.po
--- kdrill-6.3.1.pbrown/debian/po/es.po 1970-01-01 01:00:00.000000000 +0100
+++ kdrill-6.3.1/debian/po/es.po 2004-02-18 00:24:55.000000000 +0100
@@ -0,0 +1,62 @@
+# kdrill debconf translation to spanish
+# Copyright (C) 2004 Software in the Public Interest
+# This file is distributed under the same license as the kdrill package.
+#
+# Changes:
+# - Initial translation
+# Javier Fernandez-Sanguino Peña , 2004
+#
+#
+# Traductores, si no conoce el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/coordinacion
+# especialmente las notas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdrill 6.3.1-1.1\n"
+"Report-Msgid-Bugs-To: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"POT-Creation-Date: 2004-02-08 19:53-0800\n"
+"PO-Revision-Date: 2004-02-18 00:22+0100\n"
+"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
+"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../kdrill.templates:3
+msgid "kanjidic location has changed"
+msgstr "Ha cambiado la ubicación de kanjidic"
+
+#. Type: note
+#. Description
+#: ../kdrill.templates:3
+msgid ""
+"The kanjidic location was changed by the kanjidic maintainer, so the kdrill "
+"global resources line for kanjidic has changed. However, prior users of "
+"kdrill will have a saved location for the old location of kdrill in their "
+"preferences. To clear this problem, users must run kdrill with\n"
+" kdrill -kdictfile /usr/share/edict/kanjidic\n"
+"and then quit cleanly"
+msgstr ""
+"El desarrollador de kanjidic ha cambiado su ubicación, esto hace necesario "
+"cambiar la línea de los recursos globales de kdrill. Es posible que algún "
+"usuario de kdrill haya salvado ya la ubicación antigua en sus preferencias. "
+"Para resolver este problema, los usuarios deben ejecutar kdrill con\n"
+" kdrill -kdictfile /usr/share/edict/kanjidic\n"
+"y después salir del programa de forma ordenada."
diff -Nru kdrill-6.3.1.pbrown/debian/rules kdrill-6.3.1/debian/rules
--- kdrill-6.3.1.pbrown/debian/rules 2004-02-18 00:13:38.000000000 +0100
+++ kdrill-6.3.1/debian/rules 2004-02-18 00:49:03.000000000 +0100
@@ -58,7 +58,8 @@
# stupid placeholder for dh_movefiles
mkdir debian/tmp
$(MAKE) install DESTDIR=`pwd`/debian/kdrill $(SPECIALFLAGS)
-# cp kdrill.xpm debian/kdrill/usr/X11R6/include/X11/pixmaps/
+ cp kdrill.xpm debian/kdrill/usr/share/pixmaps/
+ cp kdrill.xpm debian/kanadic/usr/share/pixmaps/kanadic.xpm
cp makedic/makeedict makedic/makedic debian/makedic/usr/bin
cp makedic/*.edic debian/kanadic/usr/share/edict
# cp makedic/*.kdic debian/kanadic/usr/share/edict
Binary files kdrill-6.3.1.pbrown/makedic/makedic and kdrill-6.3.1/makedic/makedic differ
Binary files kdrill-6.3.1.pbrown/makedic/makeedict and kdrill-6.3.1/makedic/makeedict differ
Attachment:
signature.asc
Description: Digital signature