Dear maintainer of totd,

On Monday, April 12, 2010 I sent you a notice announcing my intent to upload a
NMU of your package to fix its pending l10n issues, after an initial
notice sent on Tuesday, April 06, 2010.

You either agreed for this NMU or did not respond to my notices.

I will now upload this NMU to DELAYED/7-DAY.

The NMU patch is attached to this mail.

The NMU changelog is:


Source: totd
Version: 1.4-4.4
Distribution: unstable
Urgency: low
Maintainer: Christian Perrier <[email protected]>
Date: Mon, 19 Apr 2010 07:28:19 +0200
Closes: 510338 558050
Changes: 
 totd (1.4-4.4) unstable; urgency=low
 .
   * Non-maintainer upload.
   * Bump debhelper compatibility to 7
   * As a consequence, replace "dh_clean -k" calls by "dh_prep"
   * Explicitly use "1.0" as source format
   * Use invoke-rc.d to call init scripts in resolvconf, if-up and
     if-down scripts as requested by Policy 9.3.3.2
   * No longer hardcode path to totdconfig in prerm script
   * Fix pending l10n issues. Debconf translations:
     - Spanish (Francisco Javier Cuadrado).  Closes: #510338
     - Japanese (Hideki Yamane (Debian-JP)).  Closes: #558050

-- 


diff -Nru totd-1.4.old/debian/changelog totd-1.4/debian/changelog
--- totd-1.4.old/debian/changelog	2010-04-05 19:36:31.000000000 +0200
+++ totd-1.4/debian/changelog	2010-04-19 08:58:20.000000000 +0200
@@ -1,3 +1,18 @@
+totd (1.4-4.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Bump debhelper compatibility to 7
+  * As a consequence, replace "dh_clean -k" calls by "dh_prep"
+  * Explicitly use "1.0" as source format
+  * Use invoke-rc.d to call init scripts in resolvconf, if-up and
+    if-down scripts as requested by Policy 9.3.3.2
+  * No longer hardcode path to totdconfig in prerm script
+  * Fix pending l10n issues. Debconf translations:
+    - Spanish (Francisco Javier Cuadrado).  Closes: #510338
+    - Japanese (Hideki Yamane (Debian-JP)).  Closes: #558050
+
+ -- Christian Perrier <[email protected]>  Mon, 19 Apr 2010 07:28:19 +0200
+
 totd (1.4-4.3) unstable; urgency=low
 
   * Non-maintainer upload to fix pending l10n issues.
diff -Nru totd-1.4.old/debian/compat totd-1.4/debian/compat
--- totd-1.4.old/debian/compat	2010-04-05 19:36:31.000000000 +0200
+++ totd-1.4/debian/compat	2010-04-19 07:26:18.000000000 +0200
@@ -1 +1 @@
-4
+7
diff -Nru totd-1.4.old/debian/control totd-1.4/debian/control
--- totd-1.4.old/debian/control	2010-04-05 19:36:31.000000000 +0200
+++ totd-1.4/debian/control	2010-04-19 07:26:32.000000000 +0200
@@ -2,7 +2,7 @@
 Section: net
 Priority: extra
 Maintainer: Masahito Omote <[email protected]>
-Build-Depends: debhelper (>= 4.1.68), pmake | xutils-dev
+Build-Depends: debhelper (>= 7), pmake | xutils-dev
 Standards-Version: 3.6.1.0
 
 Package: totd
diff -Nru totd-1.4.old/debian/po/es.po totd-1.4/debian/po/es.po
--- totd-1.4.old/debian/po/es.po	1970-01-01 01:00:00.000000000 +0100
+++ totd-1.4/debian/po/es.po	2010-04-06 19:06:11.000000000 +0200
@@ -0,0 +1,56 @@
+# totd po-debconf translation to Spanish
+# Copyright (C) 2007, 2008 Software in the Public Interest
+# This file is distributed under the same license as the totd package.
+#
+# Changes:
+#   - Initial translation
+#       Enrique Matias Sanchez <[email protected]>, 2007
+#
+#   - Updates
+#       Francisco Javier Cuadrado <[email protected]>, 2008
+#
+# Traductores, si no conocen 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/
+#     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: totd 1.4-4.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-01 12:37+0100\n"
+"PO-Revision-Date: 2009-01-01 13:07+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <[email protected]>\n"
+"Language-Team: Debian l10n Spanish <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Support IPv6?"
+msgstr "¿Desea activar el soporte para IPv6?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"totd can be used both with IPv4 and IPv6. Please choose whether you want to "
+"support IPv6."
+msgstr ""
+"Puede utilizar «totd» tanto con IPv4 como con IPv6. Indique si desea activar "
+"el soporte de IPv6."
diff -Nru totd-1.4.old/debian/po/ja.po totd-1.4/debian/po/ja.po
--- totd-1.4.old/debian/po/ja.po	1970-01-01 01:00:00.000000000 +0100
+++ totd-1.4/debian/po/ja.po	2010-04-06 19:06:24.000000000 +0200
@@ -0,0 +1,40 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: totd 1.4-4.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-01 12:37+0100\n"
+"PO-Revision-Date: 2009-11-11 14:32+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <[email protected]>\n"
+"Language-Team: Japanese <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Support IPv6?"
+msgstr "IPv6 をサポートしますか?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"totd can be used both with IPv4 and IPv6. Please choose whether you want to "
+"support IPv6."
+msgstr ""
+"totd は IPv4 と IPv6 の双方で使えます。IPv6 をサポートするかどうかを選んでく"
+"ださい。"
diff -Nru totd-1.4.old/debian/prerm totd-1.4/debian/prerm
--- totd-1.4.old/debian/prerm	2010-04-05 19:36:31.000000000 +0200
+++ totd-1.4/debian/prerm	2010-04-19 08:32:01.000000000 +0200
@@ -9,7 +9,7 @@
     remove)
 	if dpkg --compare-versions "$2" le 1.4-3; then
 	    if [ -f /etc/dhclient-enter-hooks ]; then
-		/usr/sbin/totdconfig -r dhcp
+		totdconfig -r dhcp
 	    fi
 	fi
 	;;
diff -Nru totd-1.4.old/debian/resolvconf totd-1.4/debian/resolvconf
--- totd-1.4.old/debian/resolvconf	2010-04-05 19:36:31.000000000 +0200
+++ totd-1.4/debian/resolvconf	2010-04-19 08:40:02.000000000 +0200
@@ -59,6 +59,9 @@
 	rm -f "$TMP_FILE"
 else
         mv -f "$TMP_FILE" "$TOTD_CONF"
-	[ -x /etc/init.d/totd ] && /etc/init.d/totd restart > /dev/null 2>&1 \
-		|| :
+	if which invoke-rc.d >/dev/null 2>&1; then
+		invoke-rc.d totd restart
+	else
+		/etc/init.d/totd restart
+	fi
 fi
diff -Nru totd-1.4.old/debian/rules totd-1.4/debian/rules
--- totd-1.4.old/debian/rules	2010-04-05 19:36:31.000000000 +0200
+++ totd-1.4/debian/rules	2010-04-19 07:26:50.000000000 +0200
@@ -49,7 +49,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	$(MAKE) install prefix=$(CURDIR)/debian/totd/usr
diff -Nru totd-1.4.old/debian/source/format totd-1.4/debian/source/format
--- totd-1.4.old/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ totd-1.4/debian/source/format	2010-04-19 07:27:37.000000000 +0200
@@ -0,0 +1 @@
+1.0
diff -Nru totd-1.4.old/debian/totd.dns-totd.ppp.ip-down totd-1.4/debian/totd.dns-totd.ppp.ip-down
--- totd-1.4.old/debian/totd.dns-totd.ppp.ip-down	2010-04-05 19:36:31.000000000 +0200
+++ totd-1.4/debian/totd.dns-totd.ppp.ip-down	2010-04-19 08:31:02.000000000 +0200
@@ -29,4 +29,8 @@
 
 killall totd
 test -f $TOTD_CONF && rm -f $TOTD_CONF
-/etc/init.d/totd start
+if which invoke-rc.d >/dev/null 2>&1; then
+	invoke-rc.d totd start
+else
+	/etc/init.d/totd start
+fi
diff -Nru totd-1.4.old/debian/totd.dns-totd.ppp.ip-up totd-1.4/debian/totd.dns-totd.ppp.ip-up
--- totd-1.4.old/debian/totd.dns-totd.ppp.ip-up	2010-04-05 19:36:31.000000000 +0200
+++ totd-1.4/debian/totd.dns-totd.ppp.ip-up	2010-04-19 08:30:57.000000000 +0200
@@ -53,6 +53,10 @@
 fi
 
 if [ -f $TOTD_PPPCONF ]; then
-    /etc/init.d/totd stop
-    /usr/sbin/totd -c $TOTD_PPPCONF &
+	if which invoke-rc.d >/dev/null 2>&1; then
+		invoke-rc.d totd stop
+	else
+		/etc/init.d/totd stop
+	fi
+	/usr/sbin/totd -c $TOTD_PPPCONF &
 fi

Attachment: signature.asc
Description: Digital signature

Reply via email to