r1982: releasing version 5.0.44

diff --git a/debian/changelog b/debian/changelog
index 8191facc9e6c0332ca9a4561e1a7e7f6448a9caa..ee96f3b16744c3e0d11ef09bcf675098a68eda66 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debhelper (5.0.44) UNRELEASED; urgency=low
+debhelper (5.0.44) unstable; urgency=low
 
   * dh_installudev: Don't fail if the link already somehow exists on initial
     package install. Closes: #415717
@@ -16,7 +16,7 @@ debhelper (5.0.44) UNRELEASED; urgency=low
     the same as all the other code in debhelper. This could only be fixed in
     v6 mode because packages may potentially legitimately rely on the old
     buggy behavior. Closes: #242834
-  * dh_installman: In v6 mode, overwrite exsiting man pages. Closes: #288250
+  * dh_installman: In v6 mode, overwrite existing man pages. Closes: #288250
   * Add dh_installifupdown. Please consider using this if you have
     /etc/network/if-up.d, etc files. Closes: #217552
 

diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index 8ec9f30e2c833493af6a1fa2b4ad682e1fc72a95..72dd84cc237ae518c298cebd949fa1cf45f96241 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: 2007-04-08  8:01-0400\n"
+"POT-Creation-Date: 2007-04-09 17:01-0400\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"
@@ -323,7 +323,7 @@ msgid ""
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:159 dh_installcatalogs:54 dh_installdocs:87 dh_installemacsen:54 dh_installexamples:50 dh_installinfo:57 dh_installinit:99 dh_installman:74 dh_installmime:41 dh_installmodules:52 dh_installwm:49 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42 dh_strip:68 dh_usrlocal:49
+#: debhelper.pod:159 dh_installcatalogs:54 dh_installdocs:87 dh_installemacsen:54 dh_installexamples:50 dh_installinfo:57 dh_installinit:99 dh_installman:74 dh_installmime:41 dh_installmodules:52 dh_installwm:51 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42 dh_strip:68 dh_usrlocal:49
 msgid "NOTES"
 msgstr ""
 
@@ -560,7 +560,7 @@ msgid "This mode works like V2, with the following additions:"
 msgstr ""
 
 # type: =item
-#: debhelper.pod:286 debhelper.pod:291 debhelper.pod:295 debhelper.pod:309 debhelper.pod:314 debhelper.pod:319 debhelper.pod:324 debhelper.pod:337 debhelper.pod:341 debhelper.pod:346 debhelper.pod:350
+#: debhelper.pod:286 debhelper.pod:291 debhelper.pod:295 debhelper.pod:309 debhelper.pod:314 debhelper.pod:319 debhelper.pod:324 debhelper.pod:337 debhelper.pod:341 debhelper.pod:346 debhelper.pod:350 debhelper.pod:363 debhelper.pod:367 debhelper.pod:373
 msgid "-"
 msgstr ""
 
@@ -649,13 +649,45 @@ msgstr ""
 msgid "dh_install errors out if wildcards expand to nothing."
 msgstr ""
 
-# type: =head2
+# type: =item
+#: debhelper.pod:356
+msgid "V6"
+msgstr ""
+
+# type: textblock
 #: debhelper.pod:358
+msgid ""
+"This mode is still under development. Currently it has these differences "
+"compared to V5:"
+msgstr ""
+
+# type: textblock
+#: debhelper.pod:365
+msgid "dh_installwm will install a slave manpage link for x-window-manager.1.gz."
+msgstr ""
+
+# type: textblock
+#: debhelper.pod:369
+msgid ""
+"dh_builddeb did not previously delete everything matching DH_ALWAYS_EXCLUDE, "
+"if it was set to a list of things to exclude, such as \"CVS:.svn\". Now it "
+"does."
+msgstr ""
+
+# type: textblock
+#: debhelper.pod:375
+msgid ""
+"dh_installman allows overwriting existing man pages in the package build "
+"directory. In previous compatability levels it silently refuses to do this."
+msgstr ""
+
+# type: =head2
+#: debhelper.pod:380
 msgid "Doc directory symlinks"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:360
+#: debhelper.pod:382
 msgid ""
 "Sometimes it is useful to make a package not contain a "
 "/usr/share/doc/package directory at all, instead placing just a dangling "
@@ -669,12 +701,12 @@ msgid ""
 msgstr ""
 
 # type: =head2
-#: debhelper.pod:369
+#: debhelper.pod:391
 msgid "udebs"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:371
+#: debhelper.pod:393
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"XC-Package-Type: udeb\" to the package's stanza in debian/control, and "
@@ -685,12 +717,12 @@ msgid ""
 msgstr ""
 
 # type: =head2
-#: debhelper.pod:378
+#: debhelper.pod:400
 msgid "Other notes"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:380
+#: debhelper.pod:402
 msgid ""
 "In general, if any debhelper program needs a directory to exist under "
 "debian/, it will create it. I haven't bothered to document this in all the "
@@ -701,7 +733,7 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:386
+#: debhelper.pod:408
 msgid ""
 "Once your package uses debhelper to build, be sure to add debhelper to your "
 "Build-Depends line in debian/control. You should build-depend on a version "
@@ -710,7 +742,7 @@ msgid ""
 msgstr ""
 
 # type: verbatim
-#: debhelper.pod:392
+#: debhelper.pod:414
 #, no-wrap
 msgid ""
 "  Build-Depends: debhelper (>= 5)\n"
@@ -718,51 +750,51 @@ msgid ""
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:394
+#: debhelper.pod:416
 msgid "ENVIRONMENT"
 msgstr ""
 
 # type: =item
-#: debhelper.pod:398
+#: debhelper.pod:420
 msgid "DH_VERBOSE"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:400
+#: debhelper.pod:422
 msgid ""
 "Set to 1 to enable verbose mode. Debhelper will output every command it runs "
 "that modifies files on the build system."
 msgstr ""
 
 # type: =item
-#: debhelper.pod:403
+#: debhelper.pod:425
 msgid "DH_COMPAT"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:405
+#: debhelper.pod:427
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in debian/compat."
 msgstr ""
 
 # type: =item
-#: debhelper.pod:408
+#: debhelper.pod:430
 msgid "DH_NO_ACT"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:410
+#: debhelper.pod:432
 msgid "Set to 1 to enable no-act mode."
 msgstr ""
 
 # type: =item
-#: debhelper.pod:412
+#: debhelper.pod:434
 msgid "DH_OPTIONS"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:414
+#: debhelper.pod:436
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands. This is useful in some situations, for example, if "
@@ -772,12 +804,12 @@ msgid ""
 msgstr ""
 
 # type: =item
-#: debhelper.pod:420
+#: debhelper.pod:442
 msgid "DH_ALWAYS_EXCLUDE"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:422
+#: debhelper.pod:444
 msgid ""
 "If set, this adds the value the variable is set to to the -X options of all "
 "commands that support the -X option. Moreover, dh_builddeb will rm -rf "
@@ -785,7 +817,7 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:426
+#: debhelper.pod:448
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting DH_ALWAYS_EXCLUDE=CVS will prevent any CVS directories from "
@@ -796,44 +828,44 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:433
+#: debhelper.pod:455
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "DH_ALWAYS_EXCLUDE=CVS:.svn"
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:438 dh_builddeb:78 dh_clean:106 dh_compress:189 dh_desktop:43 dh_fixperms:106 dh_gconf:90 dh_gencontrol:73 dh_installcatalogs:111 dh_installchangelogs:125 dh_installcron:61 dh_installdebconf:118 dh_installdeb:93 dh_installdirs:87 dh_installdocs:236 dh_installemacsen:109 dh_installexamples:102 dh_installinfo:103 dh_installinit:197 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:229 dh_installmenu:80 dh_installmime:85 dh_installmodules:120 dh_installpam:52 dh_install:251 dh_installppp:56 dh_installwm:94 dh_installxfonts:86 dh_link:212 dh_listpackages:28 dh_makeshlibs:200 dh_md5sums:86 dh_movefiles:162 dh_perl:140 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:150 dh_strip:215 dh_suidregister:117 dh_testdir:43 dh_testroot:26 dh_testversion:74 dh_undocumented:28 dh_usrlocal:114
+#: debhelper.pod:460 dh_builddeb:85 dh_clean:106 dh_compress:189 dh_desktop:43 dh_fixperms:106 dh_gconf:90 dh_gencontrol:73 dh_installcatalogs:111 dh_installchangelogs:125 dh_installcron:61 dh_installdebconf:118 dh_installdeb:93 dh_installdirs:87 dh_installdocs:236 dh_installemacsen:109 dh_installexamples:102 dh_installinfo:103 dh_installinit:197 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:229 dh_installmenu:80 dh_installmime:85 dh_installmodules:120 dh_installpam:52 dh_install:251 dh_installppp:56 dh_installwm:96 dh_installxfonts:86 dh_link:212 dh_listpackages:28 dh_makeshlibs:200 dh_md5sums:86 dh_movefiles:162 dh_perl:140 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:150 dh_strip:215 dh_suidregister:117 dh_testdir:43 dh_testroot:26 dh_testversion:74 dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
 msgstr ""
 
 # type: =item
-#: debhelper.pod:442
+#: debhelper.pod:464
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:444
+#: debhelper.pod:466
 msgid "A set of example debian/rules files that use debhelper."
 msgstr ""
 
 # type: =item
-#: debhelper.pod:446
+#: debhelper.pod:468
 msgid "L<http://kitenet.net/programs/debhelper/>"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:448
+#: debhelper.pod:470
 msgid "Debhelper web site."
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:452 dh_builddeb:84 dh_clean:112 dh_compress:195 dh_desktop:49 dh_fixperms:112 dh_gconf:96 dh_gencontrol:79 dh_installcatalogs:117 dh_installchangelogs:131 dh_installcron:67 dh_installdebconf:124 dh_installdeb:99 dh_installdirs:93 dh_installdocs:242 dh_installemacsen:115 dh_installexamples:108 dh_installinfo:109 dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:235 dh_installmenu:88 dh_installmime:91 dh_installmodules:126 dh_installpam:58 dh_install:257 dh_installppp:62 dh_installwm:100 dh_installxfonts:92 dh_link:218 dh_listpackages:34 dh_makeshlibs:206 dh_md5sums:92 dh_movefiles:168 dh_perl:146 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:156 dh_strip:221 dh_suidregister:123 dh_testdir:49 dh_testroot:32 dh_testversion:80 dh_undocumented:34 dh_usrlocal:120
+#: debhelper.pod:474 dh_builddeb:91 dh_clean:112 dh_compress:195 dh_desktop:49 dh_fixperms:112 dh_gconf:96 dh_gencontrol:79 dh_installcatalogs:117 dh_installchangelogs:131 dh_installcron:67 dh_installdebconf:124 dh_installdeb:99 dh_installdirs:93 dh_installdocs:242 dh_installemacsen:115 dh_installexamples:108 dh_installinfo:109 dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:235 dh_installmenu:88 dh_installmime:91 dh_installmodules:126 dh_installpam:58 dh_install:257 dh_installppp:62 dh_installwm:102 dh_installxfonts:92 dh_link:218 dh_listpackages:34 dh_makeshlibs:206 dh_md5sums:92 dh_movefiles:168 dh_perl:146 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:156 dh_strip:221 dh_suidregister:123 dh_testdir:49 dh_testroot:32 dh_testversion:80 dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:454 dh_builddeb:86 dh_clean:114 dh_compress:197 dh_fixperms:114 dh_gencontrol:81 dh_installchangelogs:133 dh_installcron:69 dh_installdebconf:126 dh_installdeb:101 dh_installdirs:95 dh_installdocs:244 dh_installemacsen:117 dh_installexamples:110 dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:237 dh_installmenu:90 dh_installmime:93 dh_installmodules:128 dh_installpam:60 dh_install:259 dh_installppp:64 dh_installwm:102 dh_installxfonts:94 dh_link:220 dh_listpackages:36 dh_makeshlibs:208 dh_md5sums:94 dh_movefiles:170 dh_shlibdeps:158 dh_strip:223 dh_suidregister:125 dh_testdir:51 dh_testroot:34 dh_testversion:82 dh_undocumented:36
+#: debhelper.pod:476 dh_builddeb:93 dh_clean:114 dh_compress:197 dh_fixperms:114 dh_gencontrol:81 dh_installchangelogs:133 dh_installcron:69 dh_installdebconf:126 dh_installdeb:101 dh_installdirs:95 dh_installdocs:244 dh_installemacsen:117 dh_installexamples:110 dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:237 dh_installmenu:90 dh_installmime:93 dh_installmodules:128 dh_installpam:60 dh_install:259 dh_installppp:64 dh_installwm:104 dh_installxfonts:94 dh_link:220 dh_listpackages:36 dh_makeshlibs:208 dh_md5sums:94 dh_movefiles:170 dh_shlibdeps:158 dh_strip:223 dh_suidregister:125 dh_testdir:51 dh_testroot:34 dh_testversion:82 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr ""
 
@@ -857,7 +889,7 @@ msgid ""
 msgstr ""
 
 # type: =head1
-#: dh_builddeb:21 dh_clean:25 dh_compress:38 dh_fixperms:31 dh_gconf:34 dh_gencontrol:26 dh_installcatalogs:44 dh_installchangelogs:40 dh_installcron:24 dh_installdebconf:50 dh_installdirs:32 dh_installdocs:51 dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40 dh_installman:53 dh_installmenu:34 dh_installmime:31 dh_installmodules:35 dh_installpam:24 dh_install:43 dh_installppp:26 dh_installwm:30 dh_link:48 dh_makeshlibs:24 dh_md5sums:28 dh_movefiles:32 dh_perl:28 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:25 dh_compress:38 dh_fixperms:31 dh_gconf:34 dh_gencontrol:26 dh_installcatalogs:44 dh_installchangelogs:40 dh_installcron:24 dh_installdebconf:50 dh_installdirs:32 dh_installdocs:51 dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40 dh_installman:53 dh_installmenu:34 dh_installmime:31 dh_installmodules:35 dh_installpam:24 dh_install:43 dh_installppp:26 dh_installwm:32 dh_link:48 dh_makeshlibs:24 dh_md5sums:28 dh_movefiles:32 dh_perl:28 dh_python:39 dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39
 msgid "OPTIONS"
 msgstr ""
 
@@ -901,12 +933,12 @@ msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
 msgstr ""
 
 # type: textblock
-#: dh_builddeb:80 dh_clean:108 dh_compress:191 dh_fixperms:108 dh_gconf:92 dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:127 dh_installcron:63 dh_installdebconf:120 dh_installdeb:95 dh_installdirs:89 dh_installdocs:238 dh_installemacsen:111 dh_installexamples:104 dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:231 dh_installmime:87 dh_installmodules:122 dh_installpam:54 dh_install:253 dh_installppp:58 dh_installwm:96 dh_installxfonts:88 dh_link:214 dh_listpackages:30 dh_makeshlibs:202 dh_md5sums:88 dh_movefiles:164 dh_perl:142 dh_python:284 dh_strip:217 dh_suidregister:119 dh_testdir:45 dh_testroot:28 dh_testversion:76 dh_undocumented:30 dh_usrlocal:116
+#: dh_builddeb:87 dh_clean:108 dh_compress:191 dh_fixperms:108 dh_gconf:92 dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:127 dh_installcron:63 dh_installdebconf:120 dh_installdeb:95 dh_installdirs:89 dh_installdocs:238 dh_installemacsen:111 dh_installexamples:104 dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:231 dh_installmime:87 dh_installmodules:122 dh_installpam:54 dh_install:253 dh_installppp:58 dh_installwm:98 dh_installxfonts:88 dh_link:214 dh_listpackages:30 dh_makeshlibs:202 dh_md5sums:88 dh_movefiles:164 dh_perl:142 dh_python:284 dh_strip:217 dh_suidregister:119 dh_testdir:45 dh_testroot:28 dh_testversion:76 dh_undocumented:30 dh_usrlocal:116
 msgid "L<debhelper(7)>"
 msgstr ""
 
 # type: textblock
-#: dh_builddeb:82 dh_clean:110 dh_compress:193 dh_desktop:47 dh_fixperms:110 dh_gconf:94 dh_gencontrol:77 dh_installchangelogs:129 dh_installcron:65 dh_installdebconf:122 dh_installdeb:97 dh_installdirs:91 dh_installdocs:240 dh_installemacsen:113 dh_installexamples:106 dh_installinfo:107 dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:233 dh_installmenu:86 dh_installmime:89 dh_installmodules:124 dh_installpam:56 dh_install:255 dh_installppp:60 dh_installwm:98 dh_installxfonts:90 dh_link:216 dh_listpackages:32 dh_makeshlibs:204 dh_md5sums:90 dh_movefiles:166 dh_perl:144 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:154 dh_strip:219 dh_suidregister:121 dh_testdir:47 dh_testroot:30 dh_testversion:78 dh_undocumented:32 dh_usrlocal:118
+#: dh_builddeb:89 dh_clean:110 dh_compress:193 dh_desktop:47 dh_fixperms:110 dh_gconf:94 dh_gencontrol:77 dh_installchangelogs:129 dh_installcron:65 dh_installdebconf:122 dh_installdeb:97 dh_installdirs:91 dh_installdocs:240 dh_installemacsen:113 dh_installexamples:106 dh_installinfo:107 dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:233 dh_installmenu:86 dh_installmime:89 dh_installmodules:124 dh_installpam:56 dh_install:255 dh_installppp:60 dh_installwm:100 dh_installxfonts:90 dh_link:216 dh_listpackages:32 dh_makeshlibs:204 dh_md5sums:90 dh_movefiles:166 dh_perl:144 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:154 dh_strip:219 dh_suidregister:121 dh_testdir:47 dh_testroot:30 dh_testversion:78 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr ""
 
@@ -1289,7 +1321,7 @@ msgid ""
 msgstr ""
 
 # type: =item
-#: dh_installcatalogs:48 dh_installdebconf:54 dh_installdocs:60 dh_installemacsen:39 dh_installinfo:46 dh_installinit:37 dh_installmenu:38 dh_installmime:35 dh_installmodules:39 dh_installwm:40 dh_makeshlibs:58 dh_python:60 dh_scrollkeeper:36 dh_usrlocal:43
+#: dh_installcatalogs:48 dh_installdebconf:54 dh_installdocs:60 dh_installemacsen:39 dh_installinfo:46 dh_installinit:37 dh_installmenu:38 dh_installmime:35 dh_installmodules:39 dh_installwm:42 dh_makeshlibs:58 dh_python:60 dh_scrollkeeper:36 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
 msgstr ""
 
@@ -1299,7 +1331,7 @@ msgid "Do not modify F<postinst>/F<postrm>/F<prerm> scripts."
 msgstr ""
 
 # type: textblock
-#: dh_installcatalogs:56 dh_installemacsen:56 dh_installinfo:59 dh_installinit:101 dh_installmime:43 dh_installmodules:54 dh_installwm:51 dh_scrollkeeper:44 dh_usrlocal:51
+#: dh_installcatalogs:56 dh_installemacsen:56 dh_installinfo:59 dh_installinit:101 dh_installmime:43 dh_installmodules:54 dh_installwm:53 dh_scrollkeeper:44 dh_usrlocal:51
 msgid ""
 "Note that this command is not idempotent. \"dh_clean -k\" should be called "
 "between invocations of this command. Otherwise, it may cause multiple "
@@ -1792,7 +1824,7 @@ msgid ""
 msgstr ""
 
 # type: =item
-#: dh_installemacsen:43 dh_installwm:34
+#: dh_installemacsen:43 dh_installwm:36
 msgid "B<--priority=>I<n>"
 msgstr ""
 
@@ -2770,11 +2802,13 @@ msgstr ""
 msgid ""
 "dh_installwm is a debhelper program that is responsible for generating the "
 "postinst and postrm commands that register a window manager with "
-"L<update-alternatives(8)>"
+"L<update-alternatives(8)>. The window manager's man page is also registered "
+"as a slave symlink (in v6 mode and up), and is assumed to be located in "
+"/usr/share/man/man1/<wm>.1.gz."
 msgstr ""
 
 # type: textblock
-#: dh_installwm:22
+#: dh_installwm:24
 msgid ""
 "Any window manager programs specified as parameters will be registered in "
 "the first package dh_installwm is told to act on. By default, this is the "
@@ -2783,14 +2817,14 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: dh_installwm:27
+#: dh_installwm:29
 msgid ""
 "Files named debian/package.wm can list other window manager programs to "
 "register."
 msgstr ""
 
 # type: textblock
-#: dh_installwm:36
+#: dh_installwm:38
 msgid ""
 "Set the priority of the window manager. Default is 20, which is too low for "
 "most window managers; see the Debian Policy document for instructions on "
@@ -2798,17 +2832,17 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: dh_installwm:42
+#: dh_installwm:44
 msgid "Do not modify postinst/postrm scripts. Turns this command into a no-op."
 msgstr ""
 
 # type: =item
-#: dh_installwm:44
+#: dh_installwm:46
 msgid "I<wm ...>"
 msgstr ""
 
 # type: textblock
-#: dh_installwm:46
+#: dh_installwm:48
 msgid ""
 "The commands used to run the window manager or window managers you want to "
 "register."

diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index 6cb77af6832248ed721f28f955e1019819ba6f7e..166e97fb1f61f3ede7b5974cbb61dae7bae16da7 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: 2007-04-08  8:01-0400\n"
+"POT-Creation-Date: 2007-04-09 17:01-0400\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"
@@ -448,7 +448,7 @@ msgstr ""
 #: debhelper.pod:159 dh_installcatalogs:54 dh_installdocs:87
 #: dh_installemacsen:54 dh_installexamples:50 dh_installinfo:57
 #: dh_installinit:99 dh_installman:74 dh_installmime:41 dh_installmodules:52
-#: dh_installwm:49 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42
+#: dh_installwm:51 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42
 #: dh_strip:68 dh_usrlocal:49
 msgid "NOTES"
 msgstr "NOTAS"
@@ -766,7 +766,8 @@ msgstr "Este modo funciona como el V2 con los siguientes a
 # type: =item
 #: debhelper.pod:286 debhelper.pod:291 debhelper.pod:295 debhelper.pod:309
 #: debhelper.pod:314 debhelper.pod:319 debhelper.pod:324 debhelper.pod:337
-#: debhelper.pod:341 debhelper.pod:346 debhelper.pod:350
+#: debhelper.pod:341 debhelper.pod:346 debhelper.pod:350 debhelper.pod:363
+#: debhelper.pod:367 debhelper.pod:373
 msgid "-"
 msgstr "-"
 
@@ -877,13 +878,48 @@ msgstr "dh_installdocs no instala ficheros vac
 msgid "dh_install errors out if wildcards expand to nothing."
 msgstr ""
 
-# type: =head2
+# type: =item
+#: debhelper.pod:356
+msgid "V6"
+msgstr ""
+
+# type: textblock
 #: debhelper.pod:358
+#, fuzzy
+msgid ""
+"This mode is still under development. Currently it has these differences "
+"compared to V5:"
+msgstr "Esté modo todavía está en desarrollo. Los cambios respecto a V4 son:"
+
+# type: textblock
+#: debhelper.pod:365
+#, fuzzy
+msgid ""
+"dh_installwm will install a slave manpage link for x-window-manager.1.gz."
+msgstr "dh_installwm - registra un gestor de ventanas"
+
+# type: textblock
+#: debhelper.pod:369
+msgid ""
+"dh_builddeb did not previously delete everything matching DH_ALWAYS_EXCLUDE, "
+"if it was set to a list of things to exclude, such as \"CVS:.svn\". Now it "
+"does."
+msgstr ""
+
+# type: textblock
+#: debhelper.pod:375
+msgid ""
+"dh_installman allows overwriting existing man pages in the package build "
+"directory. In previous compatability levels it silently refuses to do this."
+msgstr ""
+
+# type: =head2
+#: debhelper.pod:380
 msgid "Doc directory symlinks"
 msgstr "Enlaces a los directorios Doc"
 
 # type: textblock
-#: debhelper.pod:360
+#: debhelper.pod:382
 msgid ""
 "Sometimes it is useful to make a package not contain a /usr/share/doc/"
 "package directory at all, instead placing just a dangling symlink in the "
@@ -905,12 +941,12 @@ msgstr ""
 "colgante y no tratará de instalar un fichero de copyright o changelog."
 
 # type: =head2
-#: debhelper.pod:369
+#: debhelper.pod:391
 msgid "udebs"
 msgstr "udebs"
 
 # type: textblock
-#: debhelper.pod:371
+#: debhelper.pod:393
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"XC-Package-Type: udeb\" to the package's stanza in debian/control, and "
@@ -928,12 +964,12 @@ msgstr ""
 "preinst, postrm, prerm, y de configuración, etc."
 
 # type: =head2
-#: debhelper.pod:378
+#: debhelper.pod:400
 msgid "Other notes"
 msgstr "Otras notas"
 
 # type: textblock
-#: debhelper.pod:380
+#: debhelper.pod:402
 msgid ""
 "In general, if any debhelper program needs a directory to exist under "
 "debian/, it will create it. I haven't bothered to document this in all the "
@@ -949,7 +985,7 @@ msgstr ""
 "archivos del menú, etc."
 
 # type: textblock
-#: debhelper.pod:386
+#: debhelper.pod:408
 #, fuzzy
 msgid ""
 "Once your package uses debhelper to build, be sure to add debhelper to your "
@@ -964,7 +1000,7 @@ msgstr ""
 "paquete usa el nivel de compatibilidad 4:"
 
 # type: verbatim
-#: debhelper.pod:392
+#: debhelper.pod:414
 #, fuzzy, no-wrap
 msgid ""
 "  Build-Depends: debhelper (>= 5)\n"
@@ -974,17 +1010,17 @@ msgstr ""
 "\n"
 
 # type: =head1
-#: debhelper.pod:394
+#: debhelper.pod:416
 msgid "ENVIRONMENT"
 msgstr "ENTORNO"
 
 # type: =item
-#: debhelper.pod:398
+#: debhelper.pod:420
 msgid "DH_VERBOSE"
 msgstr "DH_VERBOSE"
 
 # type: textblock
-#: debhelper.pod:400
+#: debhelper.pod:422
 msgid ""
 "Set to 1 to enable verbose mode. Debhelper will output every command it runs "
 "that modifies files on the build system."
@@ -994,12 +1030,12 @@ msgstr ""
 "construcción."
 
 # type: =item
-#: debhelper.pod:403
+#: debhelper.pod:425
 msgid "DH_COMPAT"
 msgstr "DH_COMPAT"
 
 # type: textblock
-#: debhelper.pod:405
+#: debhelper.pod:427
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in debian/compat."
@@ -1008,22 +1044,22 @@ msgstr ""
 "debhelper, ignorando cualquier valor en debian/compat."
 
 # type: =item
-#: debhelper.pod:408
+#: debhelper.pod:430
 msgid "DH_NO_ACT"
 msgstr "DH_NO_ACT"
 
 # type: textblock
-#: debhelper.pod:410
+#: debhelper.pod:432
 msgid "Set to 1 to enable no-act mode."
 msgstr "Poner a 1 para habilitar el modo no-act."
 
 # type: =item
-#: debhelper.pod:412
+#: debhelper.pod:434
 msgid "DH_OPTIONS"
 msgstr "DH_OPTIONS"
 
 # type: textblock
-#: debhelper.pod:414
+#: debhelper.pod:436
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands. This is useful in some situations, for example, if "
@@ -1039,12 +1075,12 @@ msgstr ""
 "Lea la documentación de make para los detalles sobre como hacer esto."
 
 # type: =item
-#: debhelper.pod:420
+#: debhelper.pod:442
 msgid "DH_ALWAYS_EXCLUDE"
 msgstr "DH_ALWAYS_EXCLUDE"
 
 # type: textblock
-#: debhelper.pod:422
+#: debhelper.pod:444
 msgid ""
 "If set, this adds the value the variable is set to to the -X options of all "
 "commands that support the -X option. Moreover, dh_builddeb will rm -rf "
@@ -1055,7 +1091,7 @@ msgstr ""
 "coincida con el valor en el árbol de construcción."
 
 # type: textblock
-#: debhelper.pod:426
+#: debhelper.pod:448
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting DH_ALWAYS_EXCLUDE=CVS will prevent any CVS directories from "
@@ -1072,7 +1108,7 @@ msgstr ""
 "sitio donde se construya el paquete."
 
 # type: textblock
-#: debhelper.pod:433
+#: debhelper.pod:455
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "DH_ALWAYS_EXCLUDE=CVS:.svn"
@@ -1081,14 +1117,14 @@ msgstr ""
 "puntos, p. ej.: DH_ALWAYS_EXCLUDE=CVS:.svn"
 
 # type: =head1
-#: debhelper.pod:438 dh_builddeb:78 dh_clean:106 dh_compress:189 dh_desktop:43
+#: debhelper.pod:460 dh_builddeb:85 dh_clean:106 dh_compress:189 dh_desktop:43
 #: dh_fixperms:106 dh_gconf:90 dh_gencontrol:73 dh_installcatalogs:111
 #: dh_installchangelogs:125 dh_installcron:61 dh_installdebconf:118
 #: dh_installdeb:93 dh_installdirs:87 dh_installdocs:236 dh_installemacsen:109
 #: dh_installexamples:102 dh_installinfo:103 dh_installinit:197
 #: dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197
 #: dh_installman:229 dh_installmenu:80 dh_installmime:85 dh_installmodules:120
-#: dh_installpam:52 dh_install:251 dh_installppp:56 dh_installwm:94
+#: dh_installpam:52 dh_install:251 dh_installppp:56 dh_installwm:96
 #: dh_installxfonts:86 dh_link:212 dh_listpackages:28 dh_makeshlibs:200
 #: dh_md5sums:86 dh_movefiles:162 dh_perl:140 dh_python:282 dh_scrollkeeper:76
 #: dh_shlibdeps:150 dh_strip:215 dh_suidregister:117 dh_testdir:43
@@ -1097,34 +1133,34 @@ msgid "SEE ALSO"
 msgstr "VÉASE ADEMÁS"
 
 # type: =item
-#: debhelper.pod:442
+#: debhelper.pod:464
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 # type: textblock
-#: debhelper.pod:444
+#: debhelper.pod:466
 msgid "A set of example debian/rules files that use debhelper."
 msgstr "Varios ficheros de ejemplo debian/rules que usan debhelper."
 
 # type: =item
-#: debhelper.pod:446
+#: debhelper.pod:468
 msgid "L<http://kitenet.net/programs/debhelper/>"
 msgstr "L<http://kitenet.net/programs/debhelper/>"
 
 # type: textblock
-#: debhelper.pod:448
+#: debhelper.pod:470
 msgid "Debhelper web site."
 msgstr "Web de Debhelper."
 
 # type: =head1
-#: debhelper.pod:452 dh_builddeb:84 dh_clean:112 dh_compress:195 dh_desktop:49
+#: debhelper.pod:474 dh_builddeb:91 dh_clean:112 dh_compress:195 dh_desktop:49
 #: dh_fixperms:112 dh_gconf:96 dh_gencontrol:79 dh_installcatalogs:117
 #: dh_installchangelogs:131 dh_installcron:67 dh_installdebconf:124
 #: dh_installdeb:99 dh_installdirs:93 dh_installdocs:242 dh_installemacsen:115
 #: dh_installexamples:108 dh_installinfo:109 dh_installinit:203
 #: dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203
 #: dh_installman:235 dh_installmenu:88 dh_installmime:91 dh_installmodules:126
-#: dh_installpam:58 dh_install:257 dh_installppp:62 dh_installwm:100
+#: dh_installpam:58 dh_install:257 dh_installppp:62 dh_installwm:102
 #: dh_installxfonts:92 dh_link:218 dh_listpackages:34 dh_makeshlibs:206
 #: dh_md5sums:92 dh_movefiles:168 dh_perl:146 dh_python:288 dh_scrollkeeper:82
 #: dh_shlibdeps:156 dh_strip:221 dh_suidregister:123 dh_testdir:49
@@ -1133,14 +1169,14 @@ msgid "AUTHOR"
 msgstr "AUTOR"
 
 # type: textblock
-#: debhelper.pod:454 dh_builddeb:86 dh_clean:114 dh_compress:197
+#: debhelper.pod:476 dh_builddeb:93 dh_clean:114 dh_compress:197
 #: dh_fixperms:114 dh_gencontrol:81 dh_installchangelogs:133 dh_installcron:69
 #: dh_installdebconf:126 dh_installdeb:101 dh_installdirs:95
 #: dh_installdocs:244 dh_installemacsen:117 dh_installexamples:110
 #: dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58
 #: dh_installmanpages:205 dh_installman:237 dh_installmenu:90
 #: dh_installmime:93 dh_installmodules:128 dh_installpam:60 dh_install:259
-#: dh_installppp:64 dh_installwm:102 dh_installxfonts:94 dh_link:220
+#: dh_installppp:64 dh_installwm:104 dh_installxfonts:94 dh_link:220
 #: dh_listpackages:36 dh_makeshlibs:208 dh_md5sums:94 dh_movefiles:170
 #: dh_shlibdeps:158 dh_strip:223 dh_suidregister:125 dh_testdir:51
 #: dh_testroot:34 dh_testversion:82 dh_undocumented:36
@@ -1177,7 +1213,7 @@ msgstr ""
 #: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37
 #: dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40
 #: dh_installman:53 dh_installmenu:34 dh_installmime:31 dh_installmodules:35
-#: dh_installpam:24 dh_install:43 dh_installppp:26 dh_installwm:30 dh_link:48
+#: dh_installpam:24 dh_install:43 dh_installppp:26 dh_installwm:32 dh_link:48
 #: dh_makeshlibs:24 dh_md5sums:28 dh_movefiles:32 dh_perl:28 dh_python:39
 #: dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23
 #: dh_testversion:34 dh_usrlocal:39
@@ -1229,14 +1265,14 @@ msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
 msgstr "Pasa I<parámetros> a L<dpkg-deb(1)> cuando se construye el paquete."
 
 # type: textblock
-#: dh_builddeb:80 dh_clean:108 dh_compress:191 dh_fixperms:108 dh_gconf:92
+#: dh_builddeb:87 dh_clean:108 dh_compress:191 dh_fixperms:108 dh_gconf:92
 #: dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:127
 #: dh_installcron:63 dh_installdebconf:120 dh_installdeb:95 dh_installdirs:89
 #: dh_installdocs:238 dh_installemacsen:111 dh_installexamples:104
 #: dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53
 #: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:231
 #: dh_installmime:87 dh_installmodules:122 dh_installpam:54 dh_install:253
-#: dh_installppp:58 dh_installwm:96 dh_installxfonts:88 dh_link:214
+#: dh_installppp:58 dh_installwm:98 dh_installxfonts:88 dh_link:214
 #: dh_listpackages:30 dh_makeshlibs:202 dh_md5sums:88 dh_movefiles:164
 #: dh_perl:142 dh_python:284 dh_strip:217 dh_suidregister:119 dh_testdir:45
 #: dh_testroot:28 dh_testversion:76 dh_undocumented:30 dh_usrlocal:116
@@ -1244,13 +1280,13 @@ msgid "L<debhelper(7)>"
 msgstr "L<debhelper(7)>"
 
 # type: textblock
-#: dh_builddeb:82 dh_clean:110 dh_compress:193 dh_desktop:47 dh_fixperms:110
+#: dh_builddeb:89 dh_clean:110 dh_compress:193 dh_desktop:47 dh_fixperms:110
 #: dh_gconf:94 dh_gencontrol:77 dh_installchangelogs:129 dh_installcron:65
 #: dh_installdebconf:122 dh_installdeb:97 dh_installdirs:91 dh_installdocs:240
 #: dh_installemacsen:113 dh_installexamples:106 dh_installinfo:107
 #: dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201
 #: dh_installman:233 dh_installmenu:86 dh_installmime:89 dh_installmodules:124
-#: dh_installpam:56 dh_install:255 dh_installppp:60 dh_installwm:98
+#: dh_installpam:56 dh_install:255 dh_installppp:60 dh_installwm:100
 #: dh_installxfonts:90 dh_link:216 dh_listpackages:32 dh_makeshlibs:204
 #: dh_md5sums:90 dh_movefiles:166 dh_perl:144 dh_python:286 dh_scrollkeeper:80
 #: dh_shlibdeps:154 dh_strip:219 dh_suidregister:121 dh_testdir:47
@@ -1740,7 +1776,7 @@ msgstr ""
 # type: =item
 #: dh_installcatalogs:48 dh_installdebconf:54 dh_installdocs:60
 #: dh_installemacsen:39 dh_installinfo:46 dh_installinit:37 dh_installmenu:38
-#: dh_installmime:35 dh_installmodules:39 dh_installwm:40 dh_makeshlibs:58
+#: dh_installmime:35 dh_installmodules:39 dh_installwm:42 dh_makeshlibs:58
 #: dh_python:60 dh_scrollkeeper:36 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
 msgstr "B<-n>, B<--noscripts>"
@@ -1752,7 +1788,7 @@ msgstr "No modifica los scripts de F<postinst>/F<postrm>/F<prerm>."
 
 # type: textblock
 #: dh_installcatalogs:56 dh_installemacsen:56 dh_installinfo:59
-#: dh_installinit:101 dh_installmime:43 dh_installmodules:54 dh_installwm:51
+#: dh_installinit:101 dh_installmime:43 dh_installmodules:54 dh_installwm:53
 #: dh_scrollkeeper:44 dh_usrlocal:51
 msgid ""
 "Note that this command is not idempotent. \"dh_clean -k\" should be called "
@@ -2429,7 +2465,7 @@ msgstr ""
 "(por omisión)."
 
 # type: =item
-#: dh_installemacsen:43 dh_installwm:34
+#: dh_installemacsen:43 dh_installwm:36
 msgid "B<--priority=>I<n>"
 msgstr "B<--priority=>I<n>"
 
@@ -3723,17 +3759,20 @@ msgstr ""
 
 # type: textblock
 #: dh_installwm:18
+#, fuzzy
 msgid ""
 "dh_installwm is a debhelper program that is responsible for generating the "
 "postinst and postrm commands that register a window manager with L<update-"
-"alternatives(8)>"
+"alternatives(8)>. The window manager's man page is also registered as a "
+"slave symlink (in v6 mode and up), and is assumed to be located in /usr/"
+"share/man/man1/<wm>.1.gz."
 msgstr ""
 "dh_installwm es un programa de debhelper responsable de generar las órdenes "
 "de postinst y postrm que registran un gestor de ventanas con L<update-"
 "alternatives(8)>"
 
 # type: textblock
-#: dh_installwm:22
+#: dh_installwm:24
 msgid ""
 "Any window manager programs specified as parameters will be registered in "
 "the first package dh_installwm is told to act on. By default, this is the "
@@ -3746,7 +3785,7 @@ msgstr ""
 "será el primer paquete especificado por estas opciones."
 
 # type: textblock
-#: dh_installwm:27
+#: dh_installwm:29
 msgid ""
 "Files named debian/package.wm can list other window manager programs to "
 "register."
@@ -3755,7 +3794,7 @@ msgstr ""
 "a registrar."
 
 # type: textblock
-#: dh_installwm:36
+#: dh_installwm:38
 msgid ""
 "Set the priority of the window manager. Default is 20, which is too low for "
 "most window managers; see the Debian Policy document for instructions on "
@@ -3767,19 +3806,19 @@ msgstr ""
 "correcto."
 
 # type: textblock
-#: dh_installwm:42
+#: dh_installwm:44
 msgid "Do not modify postinst/postrm scripts. Turns this command into a no-op."
 msgstr ""
 "No modifica los scripts de postinst/postrm. Si se especifica esta orden no "
 "hace nada."
 
 # type: =item
-#: dh_installwm:44
+#: dh_installwm:46
 msgid "I<wm ...>"
 msgstr "I<gestor ...>"
 
 # type: textblock
-#: dh_installwm:46
+#: dh_installwm:48
 msgid ""
 "The commands used to run the window manager or window managers you want to "
 "register."
@@ -5354,8 +5393,3 @@ msgstr "Andrew Stribblehill <ads@debian.org>"
 #~ msgstr ""
 #~ "El script de postinst además enviará una señal a gconfd-2 de forma que "
 #~ "los esquemas instalados estén disponibles inmediatamente."
-
-# type: textblock
-#~ msgid "This mode is still under development. Its changes from V4 are:"
-#~ msgstr ""
-#~ "Esté modo todavía está en desarrollo. Los cambios respecto a V4 son:"

diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index e06ee6ede91957b75c1f9f3d1b8da4c4d94a845c..c909da95d01d5160daa579bb3f5f52bf7f89f6de 100644 (file)
--- 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: 2007-04-08  8:01-0400\n"
+"POT-Creation-Date: 2007-04-09 17:01-0400\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"
@@ -452,7 +452,7 @@ msgstr ""
 #: debhelper.pod:159 dh_installcatalogs:54 dh_installdocs:87
 #: dh_installemacsen:54 dh_installexamples:50 dh_installinfo:57
 #: dh_installinit:99 dh_installman:74 dh_installmime:41 dh_installmodules:52
-#: dh_installwm:49 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42
+#: dh_installwm:51 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42
 #: dh_strip:68 dh_usrlocal:49
 msgid "NOTES"
 msgstr "REMARQUES"
@@ -780,7 +780,8 @@ msgstr "Ce mode fonctionne comme V2 mais avec les ajouts S<suivants :>"
 # type: =item
 #: debhelper.pod:286 debhelper.pod:291 debhelper.pod:295 debhelper.pod:309
 #: debhelper.pod:314 debhelper.pod:319 debhelper.pod:324 debhelper.pod:337
-#: debhelper.pod:341 debhelper.pod:346 debhelper.pod:350
+#: debhelper.pod:341 debhelper.pod:346 debhelper.pod:350 debhelper.pod:363
+#: debhelper.pod:367 debhelper.pod:373
 msgid "-"
 msgstr "-"
 
@@ -896,13 +897,47 @@ msgstr ""
 "dh_install génère des erreurs si les jokers (wildcards) ne correspondent à "
 "rien."
 
-# type: =head2
+# type: =item
+#: debhelper.pod:356
+msgid "V6"
+msgstr ""
+
+# type: textblock
 #: debhelper.pod:358
+msgid ""
+"This mode is still under development. Currently it has these differences "
+"compared to V5:"
+msgstr ""
+
+# type: textblock
+#: debhelper.pod:365
+#, fuzzy
+msgid ""
+"dh_installwm will install a slave manpage link for x-window-manager.1.gz."
+msgstr "dh_installwm - inscrit un gestionnaire de fenêtre (window manager)"
+
+# type: textblock
+#: debhelper.pod:369
+msgid ""
+"dh_builddeb did not previously delete everything matching DH_ALWAYS_EXCLUDE, "
+"if it was set to a list of things to exclude, such as \"CVS:.svn\". Now it "
+"does."
+msgstr ""
+
+# type: textblock
+#: debhelper.pod:375
+msgid ""
+"dh_installman allows overwriting existing man pages in the package build "
+"directory. In previous compatability levels it silently refuses to do this."
+msgstr ""
+
+# type: =head2
+#: debhelper.pod:380
 msgid "Doc directory symlinks"
 msgstr "Liens symboliques vers le répertoire de documentation"
 
 # type: textblock
-#: debhelper.pod:360
+#: debhelper.pod:382
 msgid ""
 "Sometimes it is useful to make a package not contain a /usr/share/doc/"
 "package directory at all, instead placing just a dangling symlink in the "
@@ -925,12 +960,12 @@ msgstr ""
 "en l'air »> et ne pas essayer d'installer un fichier copyright ou changelog."
 
 # type: =head2
-#: debhelper.pod:369
+#: debhelper.pod:391
 msgid "udebs"
 msgstr "udebs"
 
 # type: textblock
-#: debhelper.pod:371
+#: debhelper.pod:393
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"XC-Package-Type: udeb\" to the package's stanza in debian/control, and "
@@ -949,12 +984,12 @@ msgstr ""
 "les scripts de configuration, etc."
 
 # type: =head2
-#: debhelper.pod:378
+#: debhelper.pod:400
 msgid "Other notes"
 msgstr "Autres remarques"
 
 # type: textblock
-#: debhelper.pod:380
+#: debhelper.pod:402
 msgid ""
 "In general, if any debhelper program needs a directory to exist under "
 "debian/, it will create it. I haven't bothered to document this in all the "
@@ -971,7 +1006,7 @@ msgstr ""
 "fichiers menu, etc."
 
 # type: textblock
-#: debhelper.pod:386
+#: debhelper.pod:408
 msgid ""
 "Once your package uses debhelper to build, be sure to add debhelper to your "
 "Build-Depends line in debian/control. You should build-depend on a version "
@@ -986,7 +1021,7 @@ msgstr ""
 "le paquet emploie le niveau 5 de S<compatibilité :>"
 
 # type: verbatim
-#: debhelper.pod:392
+#: debhelper.pod:414
 #, no-wrap
 msgid ""
 "  Build-Depends: debhelper (>= 5)\n"
@@ -996,17 +1031,17 @@ msgstr ""
 "\n"
 
 # type: =head1
-#: debhelper.pod:394
+#: debhelper.pod:416
 msgid "ENVIRONMENT"
 msgstr "VARIABLES D'ENVIRONNEMENT"
 
 # type: =item
-#: debhelper.pod:398
+#: debhelper.pod:420
 msgid "DH_VERBOSE"
 msgstr "DH_VERBOSE"
 
 # type: textblock
-#: debhelper.pod:400
+#: debhelper.pod:422
 msgid ""
 "Set to 1 to enable verbose mode. Debhelper will output every command it runs "
 "that modifies files on the build system."
@@ -1015,12 +1050,12 @@ msgstr ""
 "commande exécutée qui modifie des fichiers."
 
 # type: =item
-#: debhelper.pod:403
+#: debhelper.pod:425
 msgid "DH_COMPAT"
 msgstr "DH_COMPAT"
 
 # type: textblock
-#: debhelper.pod:405
+#: debhelper.pod:427
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in debian/compat."
@@ -1029,22 +1064,22 @@ msgstr ""
 "fonctionner. Cette valeur supplante la valeur précisée dans debian/compat."
 
 # type: =item
-#: debhelper.pod:408
+#: debhelper.pod:430
 msgid "DH_NO_ACT"
 msgstr "DH_NO_ACT"
 
 # type: textblock
-#: debhelper.pod:410
+#: debhelper.pod:432
 msgid "Set to 1 to enable no-act mode."
 msgstr "Mettre cette variable à 1 pour activer le mode simulation (no-act)."
 
 # type: =item
-#: debhelper.pod:412
+#: debhelper.pod:434
 msgid "DH_OPTIONS"
 msgstr "DH_OPTIONS"
 
 # type: textblock
-#: debhelper.pod:414
+#: debhelper.pod:436
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands. This is useful in some situations, for example, if "
@@ -1061,12 +1096,12 @@ msgstr ""
 "cette méthode."
 
 # type: =item
-#: debhelper.pod:420
+#: debhelper.pod:442
 msgid "DH_ALWAYS_EXCLUDE"
 msgstr "DH_ALWAYS_EXCLUDE"
 
 # type: textblock
-#: debhelper.pod:422
+#: debhelper.pod:444
 msgid ""
 "If set, this adds the value the variable is set to to the -X options of all "
 "commands that support the -X option. Moreover, dh_builddeb will rm -rf "
@@ -1078,7 +1113,7 @@ msgstr ""
 "construction de paquet."
 
 # type: textblock
-#: debhelper.pod:426
+#: debhelper.pod:448
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting DH_ALWAYS_EXCLUDE=CVS will prevent any CVS directories from "
@@ -1096,7 +1131,7 @@ msgstr ""
 "soit l'endroit où le paquet est construit."
 
 # type: textblock
-#: debhelper.pod:433
+#: debhelper.pod:455
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "DH_ALWAYS_EXCLUDE=CVS:.svn"
@@ -1105,14 +1140,14 @@ msgstr ""
 "dans DH_ALWAYS_EXCLUDE=CVS:.svn"
 
 # type: =head1
-#: debhelper.pod:438 dh_builddeb:78 dh_clean:106 dh_compress:189 dh_desktop:43
+#: debhelper.pod:460 dh_builddeb:85 dh_clean:106 dh_compress:189 dh_desktop:43
 #: dh_fixperms:106 dh_gconf:90 dh_gencontrol:73 dh_installcatalogs:111
 #: dh_installchangelogs:125 dh_installcron:61 dh_installdebconf:118
 #: dh_installdeb:93 dh_installdirs:87 dh_installdocs:236 dh_installemacsen:109
 #: dh_installexamples:102 dh_installinfo:103 dh_installinit:197
 #: dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197
 #: dh_installman:229 dh_installmenu:80 dh_installmime:85 dh_installmodules:120
-#: dh_installpam:52 dh_install:251 dh_installppp:56 dh_installwm:94
+#: dh_installpam:52 dh_install:251 dh_installppp:56 dh_installwm:96
 #: dh_installxfonts:86 dh_link:212 dh_listpackages:28 dh_makeshlibs:200
 #: dh_md5sums:86 dh_movefiles:162 dh_perl:140 dh_python:282 dh_scrollkeeper:76
 #: dh_shlibdeps:150 dh_strip:215 dh_suidregister:117 dh_testdir:43
@@ -1121,35 +1156,35 @@ msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 # type: =item
-#: debhelper.pod:442
+#: debhelper.pod:464
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr "F</usr/share/doc/debhelper/examples/>"
 
 # type: textblock
-#: debhelper.pod:444
+#: debhelper.pod:466
 msgid "A set of example debian/rules files that use debhelper."
 msgstr ""
 "Un ensemble d'exemples de fichiers debian/rules qui utilisent debhelper."
 
 # type: =item
-#: debhelper.pod:446
+#: debhelper.pod:468
 msgid "L<http://kitenet.net/programs/debhelper/>"
 msgstr "L<http://kitenet.net/programs/debhelper/>"
 
 # type: textblock
-#: debhelper.pod:448
+#: debhelper.pod:470
 msgid "Debhelper web site."
 msgstr "Le site internet de debhelper."
 
 # type: =head1
-#: debhelper.pod:452 dh_builddeb:84 dh_clean:112 dh_compress:195 dh_desktop:49
+#: debhelper.pod:474 dh_builddeb:91 dh_clean:112 dh_compress:195 dh_desktop:49
 #: dh_fixperms:112 dh_gconf:96 dh_gencontrol:79 dh_installcatalogs:117
 #: dh_installchangelogs:131 dh_installcron:67 dh_installdebconf:124
 #: dh_installdeb:99 dh_installdirs:93 dh_installdocs:242 dh_installemacsen:115
 #: dh_installexamples:108 dh_installinfo:109 dh_installinit:203
 #: dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203
 #: dh_installman:235 dh_installmenu:88 dh_installmime:91 dh_installmodules:126
-#: dh_installpam:58 dh_install:257 dh_installppp:62 dh_installwm:100
+#: dh_installpam:58 dh_install:257 dh_installppp:62 dh_installwm:102
 #: dh_installxfonts:92 dh_link:218 dh_listpackages:34 dh_makeshlibs:206
 #: dh_md5sums:92 dh_movefiles:168 dh_perl:146 dh_python:288 dh_scrollkeeper:82
 #: dh_shlibdeps:156 dh_strip:221 dh_suidregister:123 dh_testdir:49
@@ -1158,14 +1193,14 @@ msgid "AUTHOR"
 msgstr "AUTEUR"
 
 # type: textblock
-#: debhelper.pod:454 dh_builddeb:86 dh_clean:114 dh_compress:197
+#: debhelper.pod:476 dh_builddeb:93 dh_clean:114 dh_compress:197
 #: dh_fixperms:114 dh_gencontrol:81 dh_installchangelogs:133 dh_installcron:69
 #: dh_installdebconf:126 dh_installdeb:101 dh_installdirs:95
 #: dh_installdocs:244 dh_installemacsen:117 dh_installexamples:110
 #: dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58
 #: dh_installmanpages:205 dh_installman:237 dh_installmenu:90
 #: dh_installmime:93 dh_installmodules:128 dh_installpam:60 dh_install:259
-#: dh_installppp:64 dh_installwm:102 dh_installxfonts:94 dh_link:220
+#: dh_installppp:64 dh_installwm:104 dh_installxfonts:94 dh_link:220
 #: dh_listpackages:36 dh_makeshlibs:208 dh_md5sums:94 dh_movefiles:170
 #: dh_shlibdeps:158 dh_strip:223 dh_suidregister:125 dh_testdir:51
 #: dh_testroot:34 dh_testversion:82 dh_undocumented:36
@@ -1202,7 +1237,7 @@ msgstr ""
 #: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37
 #: dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40
 #: dh_installman:53 dh_installmenu:34 dh_installmime:31 dh_installmodules:35
-#: dh_installpam:24 dh_install:43 dh_installppp:26 dh_installwm:30 dh_link:48
+#: dh_installpam:24 dh_install:43 dh_installppp:26 dh_installwm:32 dh_link:48
 #: dh_makeshlibs:24 dh_md5sums:28 dh_movefiles:32 dh_perl:28 dh_python:39
 #: dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23
 #: dh_testversion:34 dh_usrlocal:39
@@ -1255,14 +1290,14 @@ msgstr ""
 "Fournit les I<paramètres> à L<dpkg-deb(1)> lors de la construction du paquet."
 
 # type: textblock
-#: dh_builddeb:80 dh_clean:108 dh_compress:191 dh_fixperms:108 dh_gconf:92
+#: dh_builddeb:87 dh_clean:108 dh_compress:191 dh_fixperms:108 dh_gconf:92
 #: dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:127
 #: dh_installcron:63 dh_installdebconf:120 dh_installdeb:95 dh_installdirs:89
 #: dh_installdocs:238 dh_installemacsen:111 dh_installexamples:104
 #: dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53
 #: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:231
 #: dh_installmime:87 dh_installmodules:122 dh_installpam:54 dh_install:253
-#: dh_installppp:58 dh_installwm:96 dh_installxfonts:88 dh_link:214
+#: dh_installppp:58 dh_installwm:98 dh_installxfonts:88 dh_link:214
 #: dh_listpackages:30 dh_makeshlibs:202 dh_md5sums:88 dh_movefiles:164
 #: dh_perl:142 dh_python:284 dh_strip:217 dh_suidregister:119 dh_testdir:45
 #: dh_testroot:28 dh_testversion:76 dh_undocumented:30 dh_usrlocal:116
@@ -1270,13 +1305,13 @@ msgid "L<debhelper(7)>"
 msgstr "L<debhelper(7)>"
 
 # type: textblock
-#: dh_builddeb:82 dh_clean:110 dh_compress:193 dh_desktop:47 dh_fixperms:110
+#: dh_builddeb:89 dh_clean:110 dh_compress:193 dh_desktop:47 dh_fixperms:110
 #: dh_gconf:94 dh_gencontrol:77 dh_installchangelogs:129 dh_installcron:65
 #: dh_installdebconf:122 dh_installdeb:97 dh_installdirs:91 dh_installdocs:240
 #: dh_installemacsen:113 dh_installexamples:106 dh_installinfo:107
 #: dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201
 #: dh_installman:233 dh_installmenu:86 dh_installmime:89 dh_installmodules:124
-#: dh_installpam:56 dh_install:255 dh_installppp:60 dh_installwm:98
+#: dh_installpam:56 dh_install:255 dh_installppp:60 dh_installwm:100
 #: dh_installxfonts:90 dh_link:216 dh_listpackages:32 dh_makeshlibs:204
 #: dh_md5sums:90 dh_movefiles:166 dh_perl:144 dh_python:286 dh_scrollkeeper:80
 #: dh_shlibdeps:154 dh_strip:219 dh_suidregister:121 dh_testdir:47
@@ -1777,7 +1812,7 @@ msgstr ""
 # type: =item
 #: dh_installcatalogs:48 dh_installdebconf:54 dh_installdocs:60
 #: dh_installemacsen:39 dh_installinfo:46 dh_installinit:37 dh_installmenu:38
-#: dh_installmime:35 dh_installmodules:39 dh_installwm:40 dh_makeshlibs:58
+#: dh_installmime:35 dh_installmodules:39 dh_installwm:42 dh_makeshlibs:58
 #: dh_python:60 dh_scrollkeeper:36 dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
 msgstr "B<-n>, B<--noscripts>"
@@ -1791,7 +1826,7 @@ msgstr ""
 
 # type: textblock
 #: dh_installcatalogs:56 dh_installemacsen:56 dh_installinfo:59
-#: dh_installinit:101 dh_installmime:43 dh_installmodules:54 dh_installwm:51
+#: dh_installinit:101 dh_installmime:43 dh_installmodules:54 dh_installwm:53
 #: dh_scrollkeeper:44 dh_usrlocal:51
 msgid ""
 "Note that this command is not idempotent. \"dh_clean -k\" should be called "
@@ -2477,7 +2512,7 @@ msgstr ""
 "défaut)."
 
 # type: =item
-#: dh_installemacsen:43 dh_installwm:34
+#: dh_installemacsen:43 dh_installwm:36
 msgid "B<--priority=>I<n>"
 msgstr "B<--priority=>I<n>"
 
@@ -3811,10 +3846,13 @@ msgstr ""
 
 # type: textblock
 #: dh_installwm:18
+#, fuzzy
 msgid ""
 "dh_installwm is a debhelper program that is responsible for generating the "
 "postinst and postrm commands that register a window manager with L<update-"
-"alternatives(8)>"
+"alternatives(8)>. The window manager's man page is also registered as a "
+"slave symlink (in v6 mode and up), and is assumed to be located in /usr/"
+"share/man/man1/<wm>.1.gz."
 msgstr ""
 "dh_installwm est le programme de la suite debhelper chargé de produire les "
 "lignes de code pour les fichiers de maintenance postinst et postrm "
@@ -3822,7 +3860,7 @@ msgstr ""
 "(8)>"
 
 # type: textblock
-#: dh_installwm:22
+#: dh_installwm:24
 msgid ""
 "Any window manager programs specified as parameters will be registered in "
 "the first package dh_installwm is told to act on. By default, this is the "
@@ -3836,7 +3874,7 @@ msgstr ""
 "options."
 
 # type: textblock
-#: dh_installwm:27
+#: dh_installwm:29
 msgid ""
 "Files named debian/package.wm can list other window manager programs to "
 "register."
@@ -3845,7 +3883,7 @@ msgstr ""
 "gestionnaires de fenêtre à inscrire."
 
 # type: textblock
-#: dh_installwm:36
+#: dh_installwm:38
 msgid ""
 "Set the priority of the window manager. Default is 20, which is too low for "
 "most window managers; see the Debian Policy document for instructions on "
@@ -3856,19 +3894,19 @@ msgstr ""
 "Charte Debian sur la méthode de détermination de la valeur adéquate."
 
 # type: textblock
-#: dh_installwm:42
+#: dh_installwm:44
 msgid "Do not modify postinst/postrm scripts. Turns this command into a no-op."
 msgstr ""
 "Empêche la modification des scripts de maintenance postinst et preinst. "
 "Utiliser ce paramètre revient à ne rien faire."
 
 # type: =item
-#: dh_installwm:44
+#: dh_installwm:46
 msgid "I<wm ...>"
 msgstr "I<gestionnaire-de-fenêtre ...>"
 
 # type: textblock
-#: dh_installwm:46
+#: dh_installwm:48
 msgid ""
 "The commands used to run the window manager or window managers you want to "
 "register."