r1882: releasing version 5.0.24

diff --git a/debian/changelog b/debian/changelog
index 24666c0540c6f0928dbde1f873aa39da82f8cb80..5e9e82aa6a912daec7860bc02974d1c33aa5071c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,16 @@
 debhelper (5.0.24) unstable; urgency=low
 
+  [ Joey Hess ]
   * Add dh_installudev by Marco d'Itri.
 
+  [ vperrin forgot to add this to the changelog when committing ]
+  * Update pot file and french translation with recent changes in
+     the dh_installdebconf manpage
+  * Add -f option to force .pot file re-building. This is in waiting
+    a patch, correcting a bug in po4a_0.23.1
+  * Add --rm-backups in clean: Otherwise ll.po~ are included in the
+    source package. (see debhelper_5.0.22.tar.gz)
+
  -- Joey Hess <joeyh@debian.org>  Thu, 23 Feb 2006 11:40:22 -0500
 
 debhelper (5.0.23) unstable; urgency=low

diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index 1bdd1acdc954d92494e7e73f7a5128b62f5a8612..f5b0d07f3a35704dacf0aa41711c93d40f484472 100644 (file)
--- a/man/po4a/po/debhelper.pot
+++ b/man/po4a/po/debhelper.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-02-22 15:31+0100\n"
+"POT-Creation-Date: 2006-02-23 11:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index ac753af7b803c47adfe8da6e31b73131ae5cf4f6..db7d539ada591eec57c150dc7e4968298eba1f97 100644 (file)
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-02-04 13:29+0100\n"
+"POT-Creation-Date: 2006-02-22 15:31+0100\n"
 "PO-Revision-Date: 2005-09-18 00:11+0200\n"
 "Last-Translator: Rubén Porras Campo <debian-l10n-spanish@lists.debian.org>\n"
 "Language-Team: SPANISH <debian-l10n-spanish@lists.debian.org>\n"
@@ -98,7 +98,7 @@ msgstr ""
 #: dh_installcron:24 dh_installinit:33 dh_usrlocal:38 dh_gconf:34
 #: dh_installmodules:35 dh_installmenu:33 dh_installlogrotate:22 dh_clean:25
 #: dh_testversion:34 dh_testdir:23 dh_shlibdeps:26 dh_scrollkeeper:31
-#: dh_installdirs:32 dh_link:48 dh_installdebconf:59 dh_installmime:30
+#: dh_installdirs:32 dh_link:48 dh_installdebconf:49 dh_installmime:30
 #: dh_installwm:30 dh_builddeb:21 dh_gencontrol:26 dh_install:43
 #: dh_makeshlibs:24 dh_perl:28 dh_fixperms:31 dh_installman:53 dh_movefiles:32
 #: dh_installchangelogs:40 dh_python:35 dh_installdocs:51
@@ -130,7 +130,7 @@ msgstr ""
 #: dh_installmodules:102 dh_installmenu:79 dh_installlogrotate:50
 #: debhelper.pod:437 dh_clean:106 dh_undocumented:28 dh_testversion:74
 #: dh_testdir:43 dh_shlibdeps:150 dh_scrollkeeper:75 dh_installdirs:87
-#: dh_link:212 dh_installdebconf:135 dh_installmime:84 dh_installwm:94
+#: dh_link:212 dh_installdebconf:117 dh_installmime:84 dh_installwm:94
 #: dh_installdeb:93 dh_builddeb:78 dh_gencontrol:73 dh_install:251
 #: dh_makeshlibs:200 dh_perl:140 dh_fixperms:107 dh_listpackages:28
 #: dh_installman:224 dh_testroot:26 dh_movefiles:162 dh_desktop:43
@@ -146,7 +146,7 @@ msgstr "V
 #: dh_installcron:63 dh_installinit:199 dh_usrlocal:115 dh_gconf:92
 #: dh_installmodules:104 dh_installlogrotate:52 dh_clean:108
 #: dh_undocumented:30 dh_testversion:76 dh_testdir:45 dh_installdirs:89
-#: dh_link:214 dh_installdebconf:137 dh_installmime:86 dh_installwm:96
+#: dh_link:214 dh_installdebconf:119 dh_installmime:86 dh_installwm:96
 #: dh_installdeb:95 dh_builddeb:80 dh_gencontrol:75 dh_install:253
 #: dh_makeshlibs:202 dh_perl:142 dh_fixperms:109 dh_listpackages:30
 #: dh_installman:226 dh_testroot:28 dh_movefiles:164 dh_suidregister:119
@@ -162,7 +162,7 @@ msgstr "L<debhelper(7)>"
 #: dh_installcron:65 dh_installinit:201 dh_usrlocal:117 dh_gconf:94
 #: dh_installmodules:106 dh_installmenu:85 dh_installlogrotate:54 dh_clean:110
 #: dh_undocumented:32 dh_testversion:78 dh_testdir:47 dh_shlibdeps:154
-#: dh_scrollkeeper:79 dh_installdirs:91 dh_link:216 dh_installdebconf:139
+#: dh_scrollkeeper:79 dh_installdirs:91 dh_link:216 dh_installdebconf:121
 #: dh_installmime:88 dh_installwm:98 dh_installdeb:97 dh_builddeb:82
 #: dh_gencontrol:77 dh_install:255 dh_makeshlibs:204 dh_perl:144
 #: dh_fixperms:111 dh_listpackages:32 dh_installman:228 dh_testroot:30
@@ -178,7 +178,7 @@ msgstr "Este programa es parte de debhelper."
 #: dh_installmodules:108 dh_installmenu:87 dh_installlogrotate:56
 #: debhelper.pod:451 dh_clean:112 dh_undocumented:34 dh_testversion:80
 #: dh_testdir:49 dh_shlibdeps:156 dh_scrollkeeper:81 dh_installdirs:93
-#: dh_link:218 dh_installdebconf:141 dh_installmime:90 dh_installwm:100
+#: dh_link:218 dh_installdebconf:123 dh_installmime:90 dh_installwm:100
 #: dh_installdeb:99 dh_builddeb:84 dh_gencontrol:79 dh_install:257
 #: dh_makeshlibs:206 dh_perl:146 dh_fixperms:113 dh_listpackages:34
 #: dh_installman:230 dh_testroot:32 dh_movefiles:168 dh_desktop:49
@@ -194,7 +194,7 @@ msgstr "AUTOR"
 #: dh_installcron:69 dh_installinit:205 dh_installmodules:110
 #: dh_installmenu:89 dh_installlogrotate:58 debhelper.pod:453 dh_clean:114
 #: dh_undocumented:36 dh_testversion:82 dh_testdir:51 dh_shlibdeps:158
-#: dh_installdirs:95 dh_link:220 dh_installdebconf:143 dh_installmime:92
+#: dh_installdirs:95 dh_link:220 dh_installdebconf:125 dh_installmime:92
 #: dh_installwm:102 dh_installdeb:101 dh_builddeb:86 dh_gencontrol:81
 #: dh_install:259 dh_makeshlibs:208 dh_fixperms:115 dh_listpackages:36
 #: dh_installman:232 dh_testroot:34 dh_movefiles:170 dh_suidregister:125
@@ -259,7 +259,7 @@ msgstr ""
 # type: =item
 #: dh_installemacsen:38 dh_installinfo:45 dh_installinit:37 dh_usrlocal:42
 #: dh_installmodules:39 dh_installmenu:37 dh_scrollkeeper:35
-#: dh_installdebconf:63 dh_installmime:34 dh_installwm:40 dh_makeshlibs:58
+#: dh_installdebconf:53 dh_installmime:34 dh_installwm:40 dh_makeshlibs:58
 #: dh_python:56 dh_installdocs:60 dh_installcatalogs:46
 msgid "B<-n>, B<--noscripts>"
 msgstr "B<-n>, B<--noscripts>"
@@ -1021,7 +1021,7 @@ msgid "B<-u>I<params> B<--update-rcd-params=>I<params>"
 msgstr "B<-u>I<parámetros> B<--update-rcd-params=>I<parámetros>"
 
 # type: =item
-#: dh_installinit:67 dh_shlibdeps:32 dh_installdebconf:67 dh_builddeb:37
+#: dh_installinit:67 dh_shlibdeps:32 dh_installdebconf:57 dh_builddeb:37
 #: dh_gencontrol:32
 msgid "B<--> I<params>"
 msgstr "B<--> I<parámetros>"
@@ -3177,24 +3177,12 @@ msgstr "FICHEROS DE PLANTILLAS TRADUCIDOS"
 
 # type: textblock
 #: dh_installdebconf:44
-msgid ""
-"Debconf also supports localized template files, and this program has some "
-"support to aid is working with them. It is best to keep the translations in ."
-"po files under debian/po, and merge them only at build time. See L<po2debconf"
-"(1)> and L<debconf-getlang(1)> for details."
-msgstr ""
-"Debconf también soporta ficheros de plantillas traducidos, y este programa "
-"ayuda a trabajar con ellos. Lo mejor es mantener las traducciones en "
-"ficheros .po dentro de debian/po, y juntarlas sólo en tiempo de compilación. "
-"Lea L<po2debconf(1)> y L<debconf-getlang(1)> para más detalles."
-
-# type: textblock
-#: dh_installdebconf:49
+#, fuzzy
 msgid ""
 "This program will look to see if you have a debian/po directory and if so "
-"will automatically call L<po2debconf(1)> to generate a merged templates "
-"file. Or if you have debian/templates.ll files, it will use the older "
-"L<debconf-mergetemplate(1)> program to merge those together."
+"will automatically call L<po2debconf(1)> to generate a merged templates file "
+"containing the translations. For this to work, your package should build-"
+"depend on po-debconf."
 msgstr ""
 "Este programa mirará si tiene el directorio debian/po y si es así llamará "
 "automáticamente a L<po2debconf(1)> para generar un fichero de plantilla "
@@ -3202,36 +3190,15 @@ msgstr ""
 "antiguo L<debconf-mergetemplate(1)> para juntarlos."
 
 # type: textblock
-#: dh_installdebconf:54
-msgid ""
-"Note that if your package has a debian/po directory it should build-depend "
-"on po-debconf."
-msgstr ""
-"Note que si su paquete tiene un directorio debian/po dependerá para ser "
-"construido de po-debconf."
-
-# type: textblock
-#: dh_installdebconf:56
-msgid ""
-"For example, if you have a German translation, strings from debian/po/de.po "
-"are merged with debian/package.templates."
-msgstr ""
-"Por ejemplo, si tiene una traducción alemana, los mensajes de debian/po/de."
-"po se juntan con debian/paquete.templates."
-
-# type: textblock
-#: dh_installdebconf:65
+#: dh_installdebconf:55
 msgid "Do not modify postrm script."
 msgstr "No modifica el script de postrm."
 
 # type: textblock
-#: dh_installdebconf:69
-msgid ""
-"Pass the params to po2debconf, if it is run or debconf-mergetemplate, if it "
-"is run."
-msgstr ""
-"Pasa los parámetros a po2debconf o a debconf-mergetemplate, si son "
-"ejecutados."
+#: dh_installdebconf:59
+#, fuzzy
+msgid "Pass the params to po2debconf."
+msgstr "Pasa \"parámetros\" a L<dpkg-gencontrol(1)>."
 
 # type: textblock
 #: dh_installmime:5
@@ -5275,6 +5242,43 @@ msgstr ""
 msgid "Jon Middleton <jjm@debian.org>"
 msgstr "Jon Middleton <jjm@debian.org>"
 
+# type: textblock
+#~ msgid ""
+#~ "Debconf also supports localized template files, and this program has some "
+#~ "support to aid is working with them. It is best to keep the translations "
+#~ "in .po files under debian/po, and merge them only at build time. See "
+#~ "L<po2debconf(1)> and L<debconf-getlang(1)> for details."
+#~ msgstr ""
+#~ "Debconf también soporta ficheros de plantillas traducidos, y este "
+#~ "programa ayuda a trabajar con ellos. Lo mejor es mantener las "
+#~ "traducciones en ficheros .po dentro de debian/po, y juntarlas sólo en "
+#~ "tiempo de compilación. Lea L<po2debconf(1)> y L<debconf-getlang(1)> para "
+#~ "más detalles."
+
+# type: textblock
+#~ msgid ""
+#~ "Note that if your package has a debian/po directory it should build-"
+#~ "depend on po-debconf."
+#~ msgstr ""
+#~ "Note que si su paquete tiene un directorio debian/po dependerá para ser "
+#~ "construido de po-debconf."
+
+# type: textblock
+#~ msgid ""
+#~ "For example, if you have a German translation, strings from debian/po/de."
+#~ "po are merged with debian/package.templates."
+#~ msgstr ""
+#~ "Por ejemplo, si tiene una traducción alemana, los mensajes de debian/po/"
+#~ "de.po se juntan con debian/paquete.templates."
+
+# type: textblock
+#~ msgid ""
+#~ "Pass the params to po2debconf, if it is run or debconf-mergetemplate, if "
+#~ "it is run."
+#~ msgstr ""
+#~ "Pasa los parámetros a po2debconf o a debconf-mergetemplate, si son "
+#~ "ejecutados."
+
 # type: textblock
 #~ msgid ""
 #~ "Note that if you use this option, your package should build-depend on "