4 files changed, 123 insertions, 83 deletions
diff --git a/debian/changelog b/debian/changelog
index c8e72844..5f8cad5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-debhelper (7.2.5) UNRELEASED; urgency=low
+debhelper (7.2.5) unstable; urgency=low
 
   * Set MODULEBUILDRC=/dev/null when running perl Build scripts
     to avoid ~/.modulebuildrc influencing the build. Closes: #517423
+  * dh_installmenus: Revert removal of update-menus calls. Closes: #518919
+    Menu refuses to add unconfigured packages to the menu, and thus
+    omits packages when triggered, unfortunatly. I hope its behavior will
+    change.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 09 Mar 2009 13:23:34 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Mar 2009 16:20:41 -0400
 
 debhelper (7.2.4) unstable; urgency=low
 
diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index 0430e574..58250003 100644
--- a/man/po4a/po/debhelper.pot
+++ b/man/po4a/po/debhelper.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-03-07 14:52-0500\n"
+"POT-Creation-Date: 2009-03-09 16:20-0300\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"
@@ -904,7 +904,7 @@ msgid ""
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:508 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47 dh_fixperms:110 dh_gconf:106 dh_gencontrol:79 dh_installcatalogs:109 dh_installchangelogs:147 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:223 dh_installemacsen:111 dh_installexamples:103 dh_installinfo:103 dh_installinit:224 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:251 dh_installmenu:72 dh_installmime:85 dh_installmodules:124 dh_installpam:52 dh_install:272 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:226 dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:164 dh_strip:226 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
+#: debhelper.pod:508 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47 dh_fixperms:110 dh_gconf:106 dh_gencontrol:79 dh_installcatalogs:109 dh_installchangelogs:147 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:223 dh_installemacsen:111 dh_installexamples:103 dh_installinfo:103 dh_installinit:224 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:251 dh_installmenu:80 dh_installmime:85 dh_installmodules:124 dh_installpam:52 dh_install:272 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:227 dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:163 dh_strip:226 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
 msgstr ""
 
@@ -929,12 +929,12 @@ msgid "Debhelper web site."
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:522 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53 dh_fixperms:116 dh_gconf:112 dh_gencontrol:85 dh_installcatalogs:115 dh_installchangelogs:153 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:229 dh_installemacsen:117 dh_installexamples:109 dh_installinfo:109 dh_installinit:230 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:257 dh_installmenu:80 dh_installmime:91 dh_installmodules:130 dh_installpam:58 dh_install:278 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:35 dh_makeshlibs:232 dh_md5sums:95 dh_movefiles:168 dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:170 dh_strip:232 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81 dh_undocumented:34 dh_usrlocal:120
+#: debhelper.pod:522 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53 dh_fixperms:116 dh_gconf:112 dh_gencontrol:85 dh_installcatalogs:115 dh_installchangelogs:153 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:229 dh_installemacsen:117 dh_installexamples:109 dh_installinfo:109 dh_installinit:230 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:257 dh_installmenu:88 dh_installmime:91 dh_installmodules:130 dh_installpam:58 dh_install:278 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:35 dh_makeshlibs:233 dh_md5sums:95 dh_movefiles:168 dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:169 dh_strip:232 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81 dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:524 dh_builddeb:95 dh_clean:138 dh_compress:198 dh_fixperms:118 dh_gencontrol:87 dh_installchangelogs:155 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:231 dh_installemacsen:119 dh_installexamples:111 dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:259 dh_installmenu:82 dh_installmime:93 dh_installmodules:132 dh_installpam:60 dh_install:280 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:37 dh_makeshlibs:234 dh_md5sums:97 dh_movefiles:170 dh_shlibdeps:172 dh_strip:234 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_testversion:83 dh_undocumented:36
+#: debhelper.pod:524 dh_builddeb:95 dh_clean:138 dh_compress:198 dh_fixperms:118 dh_gencontrol:87 dh_installchangelogs:155 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:231 dh_installemacsen:119 dh_installexamples:111 dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:259 dh_installmenu:90 dh_installmime:93 dh_installmodules:132 dh_installpam:60 dh_install:280 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:37 dh_makeshlibs:235 dh_md5sums:97 dh_movefiles:170 dh_shlibdeps:171 dh_strip:234 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_testversion:83 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr ""
 
@@ -958,7 +958,7 @@ msgid ""
 msgstr ""
 
 # type: =head1
-#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44 dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:49 dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40 dh_installman:58 dh_installmenu:33 dh_installmime:31 dh_installmodules:43 dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48 dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39 dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39
+#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44 dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:49 dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40 dh_installman:58 dh_installmenu:34 dh_installmime:31 dh_installmodules:43 dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48 dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39 dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39
 msgid "OPTIONS"
 msgstr ""
 
@@ -1002,12 +1002,12 @@ msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
 msgstr ""
 
 # type: textblock
-#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:108 dh_gencontrol:81 dh_installcatalogs:111 dh_installchangelogs:149 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:225 dh_installemacsen:113 dh_installexamples:105 dh_installinfo:105 dh_installinit:226 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:253 dh_installmime:87 dh_installmodules:126 dh_installpam:54 dh_install:274 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:31 dh_makeshlibs:228 dh_md5sums:91 dh_movefiles:164 dh_perl:154 dh_python:284 dh_strip:228 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
+#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:108 dh_gencontrol:81 dh_installcatalogs:111 dh_installchangelogs:149 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:225 dh_installemacsen:113 dh_installexamples:105 dh_installinfo:105 dh_installinit:226 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:253 dh_installmime:87 dh_installmodules:126 dh_installpam:54 dh_install:274 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:31 dh_makeshlibs:229 dh_md5sums:91 dh_movefiles:164 dh_perl:154 dh_python:284 dh_strip:228 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
 msgid "L<debhelper(7)>"
 msgstr ""
 
 # type: textblock
-#: dh_builddeb:91 dh_clean:134 dh_compress:194 dh_desktop:51 dh_fixperms:114 dh_gconf:110 dh_gencontrol:83 dh_installchangelogs:151 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:227 dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107 dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:255 dh_installmenu:78 dh_installmime:89 dh_installmodules:128 dh_installpam:56 dh_install:276 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:230 dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:168 dh_strip:230 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
+#: dh_builddeb:91 dh_clean:134 dh_compress:194 dh_desktop:51 dh_fixperms:114 dh_gconf:110 dh_gencontrol:83 dh_installchangelogs:151 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:227 dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107 dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:255 dh_installmenu:86 dh_installmime:89 dh_installmodules:128 dh_installpam:56 dh_install:276 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:231 dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:167 dh_strip:230 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr ""
 
@@ -1418,7 +1418,7 @@ msgid ""
 msgstr ""
 
 # type: =item
-#: dh_installcatalogs:46 dh_installdebconf:54 dh_installemacsen:39 dh_installinfo:46 dh_installinit:37 dh_installmenu:37 dh_installmime:35 dh_installmodules:47 dh_installwm:42 dh_makeshlibs:62 dh_python:60 dh_scrollkeeper:36 dh_usrlocal:43
+#: dh_installcatalogs:46 dh_installdebconf:54 dh_installemacsen:39 dh_installinfo:46 dh_installinit:37 dh_installmenu:38 dh_installmime:35 dh_installmodules:47 dh_installwm:42 dh_makeshlibs:62 dh_python:60 dh_scrollkeeper:36 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
 msgstr ""
 
@@ -2512,29 +2512,35 @@ msgstr ""
 # type: textblock
 #: dh_installmenu:21
 msgid ""
+"It also automatically generates the postinst and postrm commands needed to "
+"interface with the debian menu package. These commands are inserted into the "
+"maintainer scripts by dh_installdeb. See L<dh_installdeb(1)> for an "
+"explanation of how this works."
+msgstr ""
+
+# type: textblock
+#: dh_installmenu:26
+msgid ""
 "If a file named debian/package.menu exists, then it is installed into "
 "usr/share/menu/package in the package build directory. This is a debian menu "
 "file. See L<menufile(5)> for its format."
 msgstr ""
 
 # type: textblock
-#: dh_installmenu:25
+#: dh_installmenu:30
 msgid ""
 "If a file named debian/package.menu-method exits, then it is installed into "
 "etc/menu-methods/package in the package build directory. This is a debian "
-"menu method file. In this case, dh_installmenu also automatically generates "
-"the postinst and postrm commands needed to interface with the debian menu "
-"package. These commands are inserted into the maintainer scripts by "
-"dh_installdeb. See L<dh_installdeb(1)> for an explanation of how this works."
+"menu method file."
 msgstr ""
 
 # type: textblock
-#: dh_installmenu:39 dh_installmime:37 dh_installmodules:49 dh_makeshlibs:64 dh_python:62
+#: dh_installmenu:40 dh_installmime:37 dh_installmodules:49 dh_makeshlibs:64 dh_python:62
 msgid "Do not modify postinst/postrm scripts."
 msgstr ""
 
 # type: textblock
-#: dh_installmenu:74
+#: dh_installmenu:82
 msgid "L<debhelper(7)> L<update-menus(1)> L<menufile(5)>"
 msgstr ""
 
@@ -3845,7 +3851,7 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: dh_shlibdeps:166
+#: dh_shlibdeps:165
 msgid "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 msgstr ""
 
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index 88587ffd..8909ce86 100644
--- 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: 2009-03-07 14:52-0500\n"
+"POT-Creation-Date: 2009-03-09 16:20-0300\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"
@@ -1189,11 +1189,11 @@ msgstr ""
 #: dh_installdeb:94 dh_installdirs:83 dh_installdocs:223 dh_installemacsen:111
 #: dh_installexamples:103 dh_installinfo:103 dh_installinit:224
 #: dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197
-#: dh_installman:251 dh_installmenu:72 dh_installmime:85 dh_installmodules:124
+#: dh_installman:251 dh_installmenu:80 dh_installmime:85 dh_installmodules:124
 #: dh_installpam:52 dh_install:272 dh_installppp:56 dh_installwm:107
-#: dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:226
+#: dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:227
 #: dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76
-#: dh_shlibdeps:164 dh_strip:226 dh_suidregister:117 dh_testdir:44
+#: dh_shlibdeps:163 dh_strip:226 dh_suidregister:117 dh_testdir:44
 #: dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
 msgstr "V�ASE ADEM�S"
@@ -1225,11 +1225,11 @@ msgstr "Web de Debhelper."
 #: dh_installdeb:100 dh_installdirs:89 dh_installdocs:229
 #: dh_installemacsen:117 dh_installexamples:109 dh_installinfo:109
 #: dh_installinit:230 dh_installlogcheck:57 dh_installlogrotate:56
-#: dh_installmanpages:203 dh_installman:257 dh_installmenu:80
+#: dh_installmanpages:203 dh_installman:257 dh_installmenu:88
 #: dh_installmime:91 dh_installmodules:130 dh_installpam:58 dh_install:278
 #: dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229
-#: dh_listpackages:35 dh_makeshlibs:232 dh_md5sums:95 dh_movefiles:168
-#: dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:170 dh_strip:232
+#: dh_listpackages:35 dh_makeshlibs:233 dh_md5sums:95 dh_movefiles:168
+#: dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:169 dh_strip:232
 #: dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81
 #: dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
@@ -1241,11 +1241,11 @@ msgstr "AUTOR"
 #: dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91
 #: dh_installdocs:231 dh_installemacsen:119 dh_installexamples:111
 #: dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58
-#: dh_installmanpages:205 dh_installman:259 dh_installmenu:82
+#: dh_installmanpages:205 dh_installman:259 dh_installmenu:90
 #: dh_installmime:93 dh_installmodules:132 dh_installpam:60 dh_install:280
 #: dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231
-#: dh_listpackages:37 dh_makeshlibs:234 dh_md5sums:97 dh_movefiles:170
-#: dh_shlibdeps:172 dh_strip:234 dh_suidregister:125 dh_testdir:52
+#: dh_listpackages:37 dh_makeshlibs:235 dh_md5sums:97 dh_movefiles:170
+#: dh_shlibdeps:171 dh_strip:234 dh_suidregister:125 dh_testdir:52
 #: dh_testroot:35 dh_testversion:83 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -1280,7 +1280,7 @@ msgstr ""
 #: dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:49
 #: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37
 #: dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40
-#: dh_installman:58 dh_installmenu:33 dh_installmime:31 dh_installmodules:43
+#: dh_installman:58 dh_installmenu:34 dh_installmime:31 dh_installmodules:43
 #: dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48
 #: dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39
 #: dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23
@@ -1341,7 +1341,7 @@ msgstr "Pasa I<par�metros> a L<dpkg-deb(1)> cuando se construye el paquete."
 #: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:253
 #: dh_installmime:87 dh_installmodules:126 dh_installpam:54 dh_install:274
 #: dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225
-#: dh_listpackages:31 dh_makeshlibs:228 dh_md5sums:91 dh_movefiles:164
+#: dh_listpackages:31 dh_makeshlibs:229 dh_md5sums:91 dh_movefiles:164
 #: dh_perl:154 dh_python:284 dh_strip:228 dh_suidregister:119 dh_testdir:46
 #: dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
 msgid "L<debhelper(7)>"
@@ -1353,11 +1353,11 @@ msgstr "L<debhelper(7)>"
 #: dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:227
 #: dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107
 #: dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201
-#: dh_installman:255 dh_installmenu:78 dh_installmime:89 dh_installmodules:128
+#: dh_installman:255 dh_installmenu:86 dh_installmime:89 dh_installmodules:128
 #: dh_installpam:56 dh_install:276 dh_installppp:60 dh_installwm:111
-#: dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:230
+#: dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:231
 #: dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80
-#: dh_shlibdeps:168 dh_strip:230 dh_suidregister:121 dh_testdir:48
+#: dh_shlibdeps:167 dh_strip:230 dh_suidregister:121 dh_testdir:48
 #: dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr "Este programa es parte de debhelper."
@@ -1880,7 +1880,7 @@ msgstr ""
 
 # type: =item
 #: dh_installcatalogs:46 dh_installdebconf:54 dh_installemacsen:39
-#: dh_installinfo:46 dh_installinit:37 dh_installmenu:37 dh_installmime:35
+#: dh_installinfo:46 dh_installinit:37 dh_installmenu:38 dh_installmime:35
 #: dh_installmodules:47 dh_installwm:42 dh_makeshlibs:62 dh_python:60
 #: dh_scrollkeeper:36 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
@@ -3343,6 +3343,19 @@ msgstr ""
 
 # type: textblock
 #: dh_installmenu:21
+#, fuzzy
+msgid ""
+"It also automatically generates the postinst and postrm commands needed to "
+"interface with the debian menu package. These commands are inserted into the "
+"maintainer scripts by dh_installdeb. See L<dh_installdeb(1)> for an "
+"explanation of how this works."
+msgstr ""
+"Adem�s genera autom�ticamente las �rdenes de postinst y postrm necesarias "
+"para interactuar con los paquetes mime-support y shared-mime-info. Lea "
+"L<dh_installdeb(1)> para una explicaci�n acerca de como funciona esto."
+
+# type: textblock
+#: dh_installmenu:26
 msgid ""
 "If a file named debian/package.menu exists, then it is installed into usr/"
 "share/menu/package in the package build directory. This is a debian menu "
@@ -3353,28 +3366,24 @@ msgstr ""
 "Debian. Lea L<menufile(5)> para detalles acerca del formato."
 
 # type: textblock
-#: dh_installmenu:25
-#, fuzzy
+#: dh_installmenu:30
 msgid ""
 "If a file named debian/package.menu-method exits, then it is installed into "
 "etc/menu-methods/package in the package build directory. This is a debian "
-"menu method file. In this case, dh_installmenu also automatically generates "
-"the postinst and postrm commands needed to interface with the debian menu "
-"package. These commands are inserted into the maintainer scripts by "
-"dh_installdeb. See L<dh_installdeb(1)> for an explanation of how this works."
+"menu method file."
 msgstr ""
-"Adem�s genera autom�ticamente las ordenes de postinst y postrm necesarias "
-"para interaccionar con el paquete menu de Debian. Lea L<dh_installdeb(1)> "
-"para una explicaci�n acerca de como funciona esto."
+"Si existe un fichero llamado debian/paquete.menu-method, se instala en etc/"
+"menu-methods/paquete en el directorio de construcci�n del paquete. Este es "
+"un fichero de m�todo de men� de Debian."
 
 # type: textblock
-#: dh_installmenu:39 dh_installmime:37 dh_installmodules:49 dh_makeshlibs:64
+#: dh_installmenu:40 dh_installmime:37 dh_installmodules:49 dh_makeshlibs:64
 #: dh_python:62
 msgid "Do not modify postinst/postrm scripts."
 msgstr "No modifica los scripts postinst/postrm."
 
 # type: textblock
-#: dh_installmenu:74
+#: dh_installmenu:82
 msgid "L<debhelper(7)> L<update-menus(1)> L<menufile(5)>"
 msgstr "L<debhelper(7)> L<update-menus(1)> L<menufile(5)>"
 
@@ -5095,7 +5104,7 @@ msgstr ""
 "\n"
 
 # type: textblock
-#: dh_shlibdeps:166
+#: dh_shlibdeps:165
 msgid "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 msgstr "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 
@@ -5528,14 +5537,19 @@ msgid "Andrew Stribblehill <ads@debian.org>"
 msgstr "Andrew Stribblehill <ads@debian.org>"
 
 # type: textblock
+#, fuzzy
 #~ msgid ""
 #~ "If a file named debian/package.menu-method exits, then it is installed "
 #~ "into etc/menu-methods/package in the package build directory. This is a "
-#~ "debian menu method file."
+#~ "debian menu method file. In this case, dh_installmenu also automatically "
+#~ "generates the postinst and postrm commands needed to interface with the "
+#~ "debian menu package. These commands are inserted into the maintainer "
+#~ "scripts by dh_installdeb. See L<dh_installdeb(1)> for an explanation of "
+#~ "how this works."
 #~ msgstr ""
-#~ "Si existe un fichero llamado debian/paquete.menu-method, se instala en "
-#~ "etc/menu-methods/paquete en el directorio de construcci�n del paquete. "
-#~ "Este es un fichero de m�todo de men� de Debian."
+#~ "Adem�s genera autom�ticamente las ordenes de postinst y postrm necesarias "
+#~ "para interaccionar con el paquete menu de Debian. Lea L<dh_installdeb(1)> "
+#~ "para una explicaci�n acerca de como funciona esto."
 
 # type: textblock
 #, fuzzy
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 0bb2de3b..c4013505 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2009-03-07 14:52-0500\n"
+"POT-Creation-Date: 2009-03-09 16:20-0300\n"
 "PO-Revision-Date: 2006-11-19 20:50+0100\n"
 "Last-Translator: Valery Perrin <valery.perrin.debian@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1219,11 +1219,11 @@ msgstr ""
 #: dh_installdeb:94 dh_installdirs:83 dh_installdocs:223 dh_installemacsen:111
 #: dh_installexamples:103 dh_installinfo:103 dh_installinit:224
 #: dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197
-#: dh_installman:251 dh_installmenu:72 dh_installmime:85 dh_installmodules:124
+#: dh_installman:251 dh_installmenu:80 dh_installmime:85 dh_installmodules:124
 #: dh_installpam:52 dh_install:272 dh_installppp:56 dh_installwm:107
-#: dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:226
+#: dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:227
 #: dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76
-#: dh_shlibdeps:164 dh_strip:226 dh_suidregister:117 dh_testdir:44
+#: dh_shlibdeps:163 dh_strip:226 dh_suidregister:117 dh_testdir:44
 #: dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
@@ -1256,11 +1256,11 @@ msgstr "Le site internet de debhelper."
 #: dh_installdeb:100 dh_installdirs:89 dh_installdocs:229
 #: dh_installemacsen:117 dh_installexamples:109 dh_installinfo:109
 #: dh_installinit:230 dh_installlogcheck:57 dh_installlogrotate:56
-#: dh_installmanpages:203 dh_installman:257 dh_installmenu:80
+#: dh_installmanpages:203 dh_installman:257 dh_installmenu:88
 #: dh_installmime:91 dh_installmodules:130 dh_installpam:58 dh_install:278
 #: dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229
-#: dh_listpackages:35 dh_makeshlibs:232 dh_md5sums:95 dh_movefiles:168
-#: dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:170 dh_strip:232
+#: dh_listpackages:35 dh_makeshlibs:233 dh_md5sums:95 dh_movefiles:168
+#: dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:169 dh_strip:232
 #: dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81
 #: dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
@@ -1272,11 +1272,11 @@ msgstr "AUTEUR"
 #: dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91
 #: dh_installdocs:231 dh_installemacsen:119 dh_installexamples:111
 #: dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58
-#: dh_installmanpages:205 dh_installman:259 dh_installmenu:82
+#: dh_installmanpages:205 dh_installman:259 dh_installmenu:90
 #: dh_installmime:93 dh_installmodules:132 dh_installpam:60 dh_install:280
 #: dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231
-#: dh_listpackages:37 dh_makeshlibs:234 dh_md5sums:97 dh_movefiles:170
-#: dh_shlibdeps:172 dh_strip:234 dh_suidregister:125 dh_testdir:52
+#: dh_listpackages:37 dh_makeshlibs:235 dh_md5sums:97 dh_movefiles:170
+#: dh_shlibdeps:171 dh_strip:234 dh_suidregister:125 dh_testdir:52
 #: dh_testroot:35 dh_testversion:83 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -1311,7 +1311,7 @@ msgstr ""
 #: dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:49
 #: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37
 #: dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40
-#: dh_installman:58 dh_installmenu:33 dh_installmime:31 dh_installmodules:43
+#: dh_installman:58 dh_installmenu:34 dh_installmime:31 dh_installmodules:43
 #: dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48
 #: dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39
 #: dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23
@@ -1373,7 +1373,7 @@ msgstr ""
 #: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:253
 #: dh_installmime:87 dh_installmodules:126 dh_installpam:54 dh_install:274
 #: dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225
-#: dh_listpackages:31 dh_makeshlibs:228 dh_md5sums:91 dh_movefiles:164
+#: dh_listpackages:31 dh_makeshlibs:229 dh_md5sums:91 dh_movefiles:164
 #: dh_perl:154 dh_python:284 dh_strip:228 dh_suidregister:119 dh_testdir:46
 #: dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
 msgid "L<debhelper(7)>"
@@ -1385,11 +1385,11 @@ msgstr "L<debhelper(7)>"
 #: dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:227
 #: dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107
 #: dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201
-#: dh_installman:255 dh_installmenu:78 dh_installmime:89 dh_installmodules:128
+#: dh_installman:255 dh_installmenu:86 dh_installmime:89 dh_installmodules:128
 #: dh_installpam:56 dh_install:276 dh_installppp:60 dh_installwm:111
-#: dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:230
+#: dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:231
 #: dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80
-#: dh_shlibdeps:168 dh_strip:230 dh_suidregister:121 dh_testdir:48
+#: dh_shlibdeps:167 dh_strip:230 dh_suidregister:121 dh_testdir:48
 #: dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr "Ce programme fait partie de debhelper."
@@ -1924,7 +1924,7 @@ msgstr ""
 
 # type: =item
 #: dh_installcatalogs:46 dh_installdebconf:54 dh_installemacsen:39
-#: dh_installinfo:46 dh_installinit:37 dh_installmenu:37 dh_installmime:35
+#: dh_installinfo:46 dh_installinit:37 dh_installmenu:38 dh_installmime:35
 #: dh_installmodules:47 dh_installwm:42 dh_makeshlibs:62 dh_python:60
 #: dh_scrollkeeper:36 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
@@ -3422,6 +3422,21 @@ msgstr ""
 
 # type: textblock
 #: dh_installmenu:21
+#, fuzzy
+msgid ""
+"It also automatically generates the postinst and postrm commands needed to "
+"interface with the debian menu package. These commands are inserted into the "
+"maintainer scripts by dh_installdeb. See L<dh_installdeb(1)> for an "
+"explanation of how this works."
+msgstr ""
+"De plus, il produit automatiquement les lignes de code des scripts de "
+"maintenance postinst et postrm nécessaires à l'interfaçage avec le S<« mime-"
+"support »> de Debian et avec le paquet S<« shared-mime-info »>. Consulter "
+"L<dh_installdeb(1)> pour obtenir une explication sur le mécanisme "
+"d'insertion de lignes code aux scripts de maintenance."
+
+# type: textblock
+#: dh_installmenu:26
 msgid ""
 "If a file named debian/package.menu exists, then it is installed into usr/"
 "share/menu/package in the package build directory. This is a debian menu "
@@ -3433,29 +3448,24 @@ msgstr ""
 "format de ce fichier."
 
 # type: textblock
-#: dh_installmenu:25
-#, fuzzy
+#: dh_installmenu:30
 msgid ""
 "If a file named debian/package.menu-method exits, then it is installed into "
 "etc/menu-methods/package in the package build directory. This is a debian "
-"menu method file. In this case, dh_installmenu also automatically generates "
-"the postinst and postrm commands needed to interface with the debian menu "
-"package. These commands are inserted into the maintainer scripts by "
-"dh_installdeb. See L<dh_installdeb(1)> for an explanation of how this works."
+"menu method file."
 msgstr ""
-"De plus, il produit automatiquement les lignes de code des scripts de "
-"maintenance postinst et postrm nécessaires à l'interfaçage avec le paquet "
-"menu. Consulter L<dh_installdeb(1)> pour obtenir une explication sur le "
-"mécanisme d'insertion de lignes de code."
+"S'il existe un fichier nommé debian/paquet.menu-method, il est installé, "
+"dans le répertoire de construction du paquet, sous etc/menu-methods/paquet, "
+"en tant que fichier de méthode de menu Debian."
 
 # type: textblock
-#: dh_installmenu:39 dh_installmime:37 dh_installmodules:49 dh_makeshlibs:64
+#: dh_installmenu:40 dh_installmime:37 dh_installmodules:49 dh_makeshlibs:64
 #: dh_python:62
 msgid "Do not modify postinst/postrm scripts."
 msgstr "Empêche la modification des scripts de maintenance postinst et postrm."
 
 # type: textblock
-#: dh_installmenu:74
+#: dh_installmenu:82
 msgid "L<debhelper(7)> L<update-menus(1)> L<menufile(5)>"
 msgstr "L<debhelper(7)> L<update-menus(1)> L<menufile(5)>"
 
@@ -5210,7 +5220,7 @@ msgstr ""
 "\n"
 
 # type: textblock
-#: dh_shlibdeps:166
+#: dh_shlibdeps:165
 msgid "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 msgstr "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 
@@ -5658,14 +5668,20 @@ msgid "Andrew Stribblehill <ads@debian.org>"
 msgstr "Andrew Stribblehill <ads@debian.org>"
 
 # type: textblock
+#, fuzzy
 #~ msgid ""
 #~ "If a file named debian/package.menu-method exits, then it is installed "
 #~ "into etc/menu-methods/package in the package build directory. This is a "
-#~ "debian menu method file."
+#~ "debian menu method file. In this case, dh_installmenu also automatically "
+#~ "generates the postinst and postrm commands needed to interface with the "
+#~ "debian menu package. These commands are inserted into the maintainer "
+#~ "scripts by dh_installdeb. See L<dh_installdeb(1)> for an explanation of "
+#~ "how this works."
 #~ msgstr ""
-#~ "S'il existe un fichier nommé debian/paquet.menu-method, il est installé, "
-#~ "dans le répertoire de construction du paquet, sous etc/menu-methods/"
-#~ "paquet, en tant que fichier de méthode de menu Debian."
+#~ "De plus, il produit automatiquement les lignes de code des scripts de "
+#~ "maintenance postinst et postrm nécessaires à l'interfaçage avec le paquet "
+#~ "menu. Consulter L<dh_installdeb(1)> pour obtenir une explication sur le "
+#~ "mécanisme d'insertion de lignes de code."
 
 # type: textblock
 #, fuzzy