refactor

Should be no behavior changes, although I did drop the comment when
skipping an empty override target.

1 files changed, 172 insertions, 181 deletions

diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index f7dbdce5..cc1b9816 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: 2011-08-23 15:26-0400\n"
+"POT-Creation-Date: 2011-09-10 18:35-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"
@@ -27,7 +27,7 @@ msgid "debhelper - the debhelper tool suite"
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:5 dh:12 dh_auto_build:12 dh_auto_clean:13 dh_auto_configure:12 dh_auto_install:15 dh_auto_test:12 dh_bugfiles:12 dh_builddeb:12 dh_clean:12 dh_compress:13 dh_desktop:12 dh_fixperms:12 dh_gconf:12 dh_gencontrol:12 dh_icons:13 dh_install:13 dh_installcatalogs:14 dh_installchangelogs:12 dh_installcron:12 dh_installdeb:12 dh_installdebconf:12 dh_installdirs:12 dh_installdocs:12 dh_installemacsen:12 dh_installexamples:12 dh_installifupdown:12 dh_installinfo:12 dh_installinit:12 dh_installlogcheck:12 dh_installlogrotate:12 dh_installman:13 dh_installmanpages:13 dh_installmenu:12 dh_installmime:12 dh_installmodules:14 dh_installpam:12 dh_installppp:12 dh_installudev:13 dh_installwm:12 dh_installxfonts:12 dh_link:13 dh_lintian:12 dh_listpackages:12 dh_makeshlibs:12 dh_md5sums:13 dh_movefiles:12 dh_perl:14 dh_prep:12 dh_python:13 dh_scrollkeeper:12 dh_shlibdeps:13 dh_strip:13 dh_suidregister:7 dh_testdir:12 dh_testroot:7 dh_undocumented:12 dh_usrlocal:15
+#: debhelper.pod:5 dh:12 dh_auto_build:12 dh_auto_clean:13 dh_auto_configure:12 dh_auto_install:15 dh_auto_test:13 dh_bugfiles:12 dh_builddeb:12 dh_clean:12 dh_compress:13 dh_desktop:12 dh_fixperms:12 dh_gconf:12 dh_gencontrol:12 dh_icons:13 dh_install:13 dh_installcatalogs:14 dh_installchangelogs:12 dh_installcron:12 dh_installdeb:12 dh_installdebconf:12 dh_installdirs:12 dh_installdocs:12 dh_installemacsen:12 dh_installexamples:12 dh_installifupdown:12 dh_installinfo:12 dh_installinit:12 dh_installlogcheck:12 dh_installlogrotate:12 dh_installman:13 dh_installmanpages:13 dh_installmenu:12 dh_installmime:12 dh_installmodules:14 dh_installpam:12 dh_installppp:12 dh_installudev:13 dh_installwm:12 dh_installxfonts:12 dh_link:13 dh_lintian:12 dh_listpackages:12 dh_makeshlibs:12 dh_md5sums:13 dh_movefiles:12 dh_perl:14 dh_prep:12 dh_python:13 dh_scrollkeeper:12 dh_shlibdeps:13 dh_strip:13 dh_suidregister:7 dh_testdir:12 dh_testroot:7 dh_undocumented:12 dh_usrlocal:15
 msgid "SYNOPSIS"
 msgstr ""
 
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:9 dh:16 dh_auto_build:16 dh_auto_clean:17 dh_auto_configure:16 dh_auto_install:19 dh_auto_test:16 dh_bugfiles:16 dh_builddeb:16 dh_clean:16 dh_compress:17 dh_desktop:16 dh_fixperms:16 dh_gconf:16 dh_gencontrol:16 dh_icons:17 dh_install:17 dh_installcatalogs:18 dh_installchangelogs:16 dh_installcron:16 dh_installdeb:16 dh_installdebconf:16 dh_installdirs:16 dh_installdocs:16 dh_installemacsen:16 dh_installexamples:16 dh_installifupdown:16 dh_installinfo:16 dh_installinit:16 dh_installlogcheck:16 dh_installlogrotate:16 dh_installman:17 dh_installmanpages:17 dh_installmenu:16 dh_installmime:16 dh_installmodules:18 dh_installpam:16 dh_installppp:16 dh_installudev:17 dh_installwm:16 dh_installxfonts:16 dh_link:17 dh_lintian:16 dh_listpackages:16 dh_makeshlibs:16 dh_md5sums:17 dh_movefiles:16 dh_perl:18 dh_prep:16 dh_python:17 dh_scrollkeeper:16 dh_shlibdeps:17 dh_strip:17 dh_suidregister:11 dh_testdir:16 dh_testroot:11 dh_undocumented:16 dh_usrlocal:19
+#: debhelper.pod:9 dh:16 dh_auto_build:16 dh_auto_clean:17 dh_auto_configure:16 dh_auto_install:19 dh_auto_test:17 dh_bugfiles:16 dh_builddeb:16 dh_clean:16 dh_compress:17 dh_desktop:16 dh_fixperms:16 dh_gconf:16 dh_gencontrol:16 dh_icons:17 dh_install:17 dh_installcatalogs:18 dh_installchangelogs:16 dh_installcron:16 dh_installdeb:16 dh_installdebconf:16 dh_installdirs:16 dh_installdocs:16 dh_installemacsen:16 dh_installexamples:16 dh_installifupdown:16 dh_installinfo:16 dh_installinit:16 dh_installlogcheck:16 dh_installlogrotate:16 dh_installman:17 dh_installmanpages:17 dh_installmenu:16 dh_installmime:16 dh_installmodules:18 dh_installpam:16 dh_installppp:16 dh_installudev:17 dh_installwm:16 dh_installxfonts:16 dh_link:17 dh_lintian:16 dh_listpackages:16 dh_makeshlibs:16 dh_md5sums:17 dh_movefiles:16 dh_perl:18 dh_prep:16 dh_python:17 dh_scrollkeeper:16 dh_shlibdeps:17 dh_strip:17 dh_suidregister:11 dh_testdir:16 dh_testroot:11 dh_undocumented:16 dh_usrlocal:19
 msgid "DESCRIPTION"
 msgstr ""
 
@@ -203,7 +203,7 @@ msgid "Verbose mode: show all commands that modify the package build directory."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:101 dh:76
+#: debhelper.pod:101 dh:56
 msgid "B<--no-act>"
 msgstr ""
 
@@ -602,7 +602,7 @@ msgid "This mode works like v2, with the following additions:"
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:300 debhelper.pod:305 debhelper.pod:309 debhelper.pod:323 debhelper.pod:328 debhelper.pod:333 debhelper.pod:338 debhelper.pod:352 debhelper.pod:356 debhelper.pod:361 debhelper.pod:365 debhelper.pod:377 debhelper.pod:382 debhelper.pod:388 debhelper.pod:394 debhelper.pod:407 debhelper.pod:414 debhelper.pod:418 debhelper.pod:422 debhelper.pod:437 debhelper.pod:441 debhelper.pod:449 debhelper.pod:454 debhelper.pod:468 debhelper.pod:473 debhelper.pod:479 debhelper.pod:484 debhelper.pod:488
+#: debhelper.pod:300 debhelper.pod:305 debhelper.pod:309 debhelper.pod:323 debhelper.pod:328 debhelper.pod:333 debhelper.pod:338 debhelper.pod:352 debhelper.pod:356 debhelper.pod:361 debhelper.pod:365 debhelper.pod:377 debhelper.pod:382 debhelper.pod:388 debhelper.pod:394 debhelper.pod:407 debhelper.pod:414 debhelper.pod:418 debhelper.pod:422 debhelper.pod:437 debhelper.pod:441 debhelper.pod:449 debhelper.pod:454 debhelper.pod:468 debhelper.pod:473 debhelper.pod:480 debhelper.pod:485 debhelper.pod:489
 msgid "-"
 msgstr ""
 
@@ -843,25 +843,26 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:475
 msgid ""
-"dh allows defining custom build, build-arch, and build-indep targets in "
-"debian/rules, without needing to manually define the other targets that "
-"depend on them."
+"dh is aware of the usual dependencies between targets in debian/rules.  So, "
+"\"dh binary\" will run any build, build-arch, build-indep, install, etc "
+"targets that exist in the rules file. There's no need to define an explicit "
+"binary target with explicit dependencies on the other targets."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:481
+#: debhelper.pod:482
 msgid ""
 "B<dh_auto_configure> does not include the source package name in "
 "--libexecdir when using autoconf."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:486
+#: debhelper.pod:487
 msgid "B<dh> does not default to enabling --with=python-support"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:490
+#: debhelper.pod:491
 msgid ""
 "All of the B<dh_auto_>I<*> debhelper programs and B<dh> set environment "
 "variables listed by B<dpkg-buildflags>, unless they are already set. They "
@@ -869,17 +870,17 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:498 dh_auto_test:44 dh_installcatalogs:59 dh_installdocs:116 dh_installemacsen:67 dh_installexamples:53 dh_installinit:133 dh_installman:81 dh_installmime:51 dh_installmodules:60 dh_installudev:55 dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
+#: debhelper.pod:499 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:116 dh_installemacsen:67 dh_installexamples:53 dh_installinit:133 dh_installman:81 dh_installmime:51 dh_installmodules:60 dh_installudev:55 dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
 msgid "NOTES"
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:500
+#: debhelper.pod:501
 msgid "Multiple binary package support"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:502
+#: debhelper.pod:503
 msgid ""
 "If your source package generates more than one binary package, debhelper "
 "programs will default to acting on all binary packages when run. If your "
@@ -891,7 +892,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:510
+#: debhelper.pod:511
 msgid ""
 "To facilitate this, as well as give you more control over which packages are "
 "acted on by debhelper programs, all debhelper programs accept the B<-a>, "
@@ -901,12 +902,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:516
+#: debhelper.pod:517
 msgid "Automatic generation of Debian install scripts"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:518
+#: debhelper.pod:519
 msgid ""
 "Some debhelper commands will automatically generate parts of Debian "
 "maintainer scripts. If you want these automatically generated things "
@@ -917,21 +918,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:525
+#: debhelper.pod:526
 msgid ""
 "If a script does not exist at all and debhelper needs to add something to "
 "it, then debhelper will create the complete script."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:528
+#: debhelper.pod:529
 msgid ""
 "All debhelper commands that automatically generate code in this way let it "
 "be disabled by the -n parameter (see above)."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:531
+#: debhelper.pod:532
 msgid ""
 "Note that the inserted code will be shell code, so you cannot directly use "
 "it in a Perl script. If you would like to embed it into a Perl script, here "
@@ -940,7 +941,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: debhelper.pod:536
+#: debhelper.pod:537
 #, no-wrap
 msgid ""
 "  my $temp=\"set -e\\nset -- @ARGV\\n\" . << 'EOF';\n"
@@ -952,12 +953,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:542
+#: debhelper.pod:543
 msgid "Automatic generation of miscellaneous dependencies."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:544
+#: debhelper.pod:545
 msgid ""
 "Some debhelper commands may make the generated package need to depend on "
 "some other packages. For example, if you use L<dh_installdebconf(1)>, your "
@@ -969,7 +970,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:552
+#: debhelper.pod:553
 msgid ""
 "All commands of this type, besides documenting what dependencies may be "
 "needed on their man pages, will automatically generate a substvar called "
@@ -978,7 +979,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:557
+#: debhelper.pod:558
 msgid ""
 "This is entirely independent of the standard B<${shlibs:Depends}> generated "
 "by L<dh_makeshlibs(1)>, and the B<${perl:Depends}> generated by "
@@ -987,19 +988,19 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:562
+#: debhelper.pod:563
 msgid "Package build directories"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:564
+#: debhelper.pod:565
 msgid ""
 "By default, all debhelper programs assume that the temporary directory used "
 "for assembling the tree of files in a package is debian/I<package>."
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:567
+#: debhelper.pod:568
 msgid ""
 "Sometimes, you might want to use some other temporary directory. This is "
 "supported by the B<-P> flag. For example, \"B<dh_installdocs "
@@ -1011,12 +1012,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:575
+#: debhelper.pod:576
 msgid "udebs"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:577
+#: debhelper.pod:578
 msgid ""
 "Debhelper includes support for udebs. To create a udeb with debhelper, add "
 "\"B<Package-Type: udeb>\" to the package's stanza in F<debian/control>, and "
@@ -1027,12 +1028,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: debhelper.pod:584
+#: debhelper.pod:585
 msgid "Build depends"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:586
+#: debhelper.pod:587
 msgid ""
 "Once your package uses debhelper to build, be sure to add debhelper to your "
 "Build-Depends line in F<debian/control>. You should build-depend on a "
@@ -1041,7 +1042,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: debhelper.pod:592
+#: debhelper.pod:593
 #, no-wrap
 msgid ""
 "  Build-Depends: debhelper (>= 7)\n"
@@ -1049,51 +1050,51 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:594
+#: debhelper.pod:595
 msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:598
+#: debhelper.pod:599
 msgid "B<DH_VERBOSE>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:600
+#: debhelper.pod:601
 msgid ""
 "Set to B<1> to enable verbose mode. Debhelper will output every command it "
 "runs that modifies files on the build system."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:603
+#: debhelper.pod:604
 msgid "B<DH_COMPAT>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:605
+#: debhelper.pod:606
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in F<debian/compat>."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:608
+#: debhelper.pod:609
 msgid "B<DH_NO_ACT>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:610
+#: debhelper.pod:611
 msgid "Set to B<1> to enable no-act mode."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:612
+#: debhelper.pod:613
 msgid "B<DH_OPTIONS>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:614
+#: debhelper.pod:615
 msgid ""
 "Anything in this variable will be prepended to the command line arguments of "
 "all debhelper commands. Command-specific options will be ignored by commands "
@@ -1101,7 +1102,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:618
+#: debhelper.pod:619
 msgid ""
 "This is useful in some situations, for example, if you need to pass B<-p> to "
 "all debhelper commands that will be run. One good way to set B<DH_OPTIONS> "
@@ -1110,12 +1111,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:623
+#: debhelper.pod:624
 msgid "B<DH_ALWAYS_EXCLUDE>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:625
+#: debhelper.pod:626
 msgid ""
 "If set, this adds the value the variable is set to to the B<-X> options of "
 "all commands that support the B<-X> option. Moreover, B<dh_builddeb> will "
@@ -1123,7 +1124,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:629
+#: debhelper.pod:630
 msgid ""
 "This can be useful if you are doing a build from a CVS source tree, in which "
 "case setting B<DH_ALWAYS_EXCLUDE=CVS> will prevent any CVS directories from "
@@ -1134,44 +1135,44 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:636
+#: debhelper.pod:637
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "B<DH_ALWAYS_EXCLUDE=CVS:.svn>"
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:641 dh:866 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:53 dh_auto_install:85 dh_auto_test:58 dh_bugfiles:122 dh_builddeb:123 dh_clean:142 dh_compress:206 dh_desktop:31 dh_fixperms:129 dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:279 dh_installcatalogs:116 dh_installchangelogs:171 dh_installcron:77 dh_installdeb:144 dh_installdebconf:126 dh_installdirs:86 dh_installdocs:307 dh_installemacsen:124 dh_installexamples:106 dh_installifupdown:69 dh_installinfo:77 dh_installinit:275 dh_installlogcheck:76 dh_installlogrotate:50 dh_installman:258 dh_installmanpages:197 dh_installmenu:87 dh_installmime:95 dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:115 dh_installwm:108 dh_installxfonts:87 dh_link:226 dh_lintian:57 dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 dh_perl:146 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:171 dh_strip:230 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_undocumented:28 dh_usrlocal:114
+#: debhelper.pod:642 dh:858 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:53 dh_auto_install:85 dh_auto_test:59 dh_bugfiles:122 dh_builddeb:120 dh_clean:142 dh_compress:206 dh_desktop:31 dh_fixperms:129 dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:279 dh_installcatalogs:116 dh_installchangelogs:171 dh_installcron:77 dh_installdeb:144 dh_installdebconf:126 dh_installdirs:86 dh_installdocs:307 dh_installemacsen:124 dh_installexamples:106 dh_installifupdown:69 dh_installinfo:77 dh_installinit:275 dh_installlogcheck:76 dh_installlogrotate:50 dh_installman:259 dh_installmanpages:197 dh_installmenu:87 dh_installmime:95 dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:115 dh_installwm:108 dh_installxfonts:87 dh_link:226 dh_lintian:57 dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 dh_perl:146 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:171 dh_strip:230 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:645
+#: debhelper.pod:646
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:647
+#: debhelper.pod:648
 msgid "A set of example F<debian/rules> files that use debhelper."
 msgstr ""
 
 #. type: =item
-#: debhelper.pod:649
+#: debhelper.pod:650
 msgid "L<http://kitenet.net/~joey/code/debhelper/>"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:651
+#: debhelper.pod:652
 msgid "Debhelper web site."
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:655 dh:872 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:59 dh_auto_install:91 dh_auto_test:64 dh_bugfiles:130 dh_builddeb:129 dh_clean:148 dh_compress:212 dh_desktop:37 dh_fixperms:135 dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:285 dh_installcatalogs:122 dh_installchangelogs:177 dh_installcron:83 dh_installdeb:150 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:313 dh_installemacsen:130 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:82 dh_installlogrotate:56 dh_installman:264 dh_installmanpages:203 dh_installmenu:95 dh_installmime:101 dh_installmodules:130 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:65 dh_listpackages:36 dh_makeshlibs:264 dh_md5sums:96 dh_movefiles:176 dh_perl:152 dh_prep:66 dh_python:286 dh_scrollkeeper:34 dh_shlibdeps:177 dh_strip:236 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120
+#: debhelper.pod:656 dh:864 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:59 dh_auto_install:91 dh_auto_test:65 dh_bugfiles:130 dh_builddeb:126 dh_clean:148 dh_compress:212 dh_desktop:37 dh_fixperms:135 dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:285 dh_installcatalogs:122 dh_installchangelogs:177 dh_installcron:83 dh_installdeb:150 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:313 dh_installemacsen:130 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:83 dh_installlogcheck:82 dh_installlogrotate:56 dh_installman:265 dh_installmanpages:203 dh_installmenu:95 dh_installmime:101 dh_installmodules:130 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:65 dh_listpackages:36 dh_makeshlibs:264 dh_md5sums:96 dh_movefiles:176 dh_perl:152 dh_prep:66 dh_python:286 dh_scrollkeeper:34 dh_shlibdeps:177 dh_strip:236 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:657 dh:874 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:61 dh_auto_install:93 dh_auto_test:66 dh_builddeb:131 dh_clean:150 dh_compress:214 dh_fixperms:137 dh_gencontrol:90 dh_install:287 dh_installchangelogs:179 dh_installcron:85 dh_installdeb:152 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:315 dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:85 dh_installinit:283 dh_installlogrotate:58 dh_installman:266 dh_installmanpages:205 dh_installmenu:97 dh_installmime:103 dh_installmodules:132 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:234 dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:179 dh_strip:238 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_undocumented:36
+#: debhelper.pod:658 dh:866 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:61 dh_auto_install:93 dh_auto_test:67 dh_builddeb:128 dh_clean:150 dh_compress:214 dh_fixperms:137 dh_gencontrol:90 dh_install:287 dh_installchangelogs:179 dh_installcron:85 dh_installdeb:152 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:315 dh_installemacsen:132 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:85 dh_installinit:283 dh_installlogrotate:58 dh_installman:267 dh_installmanpages:205 dh_installmenu:97 dh_installmime:103 dh_installmodules:132 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:234 dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:179 dh_strip:238 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr ""
 
@@ -1184,8 +1185,7 @@ msgstr ""
 #: dh:14
 msgid ""
 "B<dh> I<sequence> [B<--with> I<addon>[B<,>I<addon> ...]] [B<--list>] "
-"[B<--until> I<cmd>] [B<--before> I<cmd>] [B<--after> I<cmd>] "
-"[B<--remaining>] [S<I<debhelper options>>]"
+"[S<I<debhelper options>>]"
 msgstr ""
 
 #. type: textblock
@@ -1219,7 +1219,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh:35 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:30 dh_bugfiles:50 dh_builddeb:21 dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:56 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:66 dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:48 dh_installlogcheck:42 dh_installlogrotate:22 dh_installman:60 dh_installmanpages:40 dh_installmenu:41 dh_installmime:41 dh_installmodules:44 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:51 dh_makeshlibs:43 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_python:39 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_usrlocal:39
+#: dh:35 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:21 dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_icons:25 dh_install:54 dh_installcatalogs:49 dh_installchangelogs:56 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:66 dh_installemacsen:48 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:48 dh_installlogcheck:40 dh_installlogrotate:22 dh_installman:60 dh_installmanpages:40 dh_installmenu:41 dh_installmime:41 dh_installmodules:44 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:51 dh_makeshlibs:43 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_python:39 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_usrlocal:39
 msgid "OPTIONS"
 msgstr ""
 
@@ -1254,84 +1254,33 @@ msgstr ""
 msgid "List all available addons."
 msgstr ""
 
-#. type: =item
-#: dh:56
-msgid "B<--until> I<cmd>"
-msgstr ""
-
 #. type: textblock
 #: dh:58
-msgid ""
-"Run commands in the sequence until and including I<cmd>, then stop.  "
-"(Deprecated)"
-msgstr ""
-
-#. type: =item
-#: dh:61
-msgid "B<--before> I<cmd>"
-msgstr ""
-
-#. type: textblock
-#: dh:63
-msgid "Run commands in the sequence before I<cmd>, then stop.  (Deprecated)"
-msgstr ""
-
-#. type: =item
-#: dh:66
-msgid "B<--after> I<cmd>"
-msgstr ""
-
-#. type: textblock
-#: dh:68
-msgid "Run commands in the sequence that come after I<cmd>.  (Deprecated)"
-msgstr ""
-
-#. type: =item
-#: dh:71
-msgid "B<--remaining>"
-msgstr ""
-
-#. type: textblock
-#: dh:73
-msgid "Run all commands in the sequence that have yet to be run.  (Deprecated)"
-msgstr ""
-
-#. type: textblock
-#: dh:78
 msgid "Prints commands that would run for a given sequence, but does not run them."
 msgstr ""
 
 #. type: textblock
-#: dh:82
-msgid ""
-"All other options passed to B<dh> are passed on to each command it "
-"runs. This can be used to set an option like B<-v> or B<-X> or B<-N>, as "
-"well as for more specialised options."
-msgstr ""
-
-#. type: textblock
-#: dh:86
+#: dh:62
 msgid ""
-"In the above options, I<cmd> can be a full name of a debhelper command, or a "
-"substring. It'll first search for a command in the sequence exactly matching "
-"the name, to avoid any ambiguity. If there are multiple substring matches, "
-"the last one in the sequence will be used."
+"Other options passed to B<dh> are passed on to each command it runs. This "
+"can be used to set an option like B<-v> or B<-X> or B<-N>, as well as for "
+"more specialised options."
 msgstr ""
 
 #. type: =head1
-#: dh:117 dh_installdocs:105 dh_link:73 dh_makeshlibs:97 dh_shlibdeps:69
+#: dh:66 dh_installdocs:105 dh_link:73 dh_makeshlibs:97 dh_shlibdeps:69
 msgid "EXAMPLES"
 msgstr ""
 
 #. type: textblock
-#: dh:119
+#: dh:68
 msgid ""
 "To see what commands are included in a sequence, without actually doing "
 "anything:"
 msgstr ""
 
 #. type: verbatim
-#: dh:122
+#: dh:71
 #, no-wrap
 msgid ""
 "\tdh binary-arch --no-act\n"
@@ -1339,14 +1288,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:124
+#: dh:73
 msgid ""
 "This is a very simple rules file, for packages where the default sequences "
 "of commands work with no additional options."
 msgstr ""
 
 #. type: verbatim
-#: dh:127 dh:134 dh:148 dh:161
+#: dh:76 dh:83 dh:97 dh:110
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -1356,7 +1305,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:131
+#: dh:80
 #, no-wrap
 msgid ""
 "Often you'll want to pass an option to a specific debhelper command. The\n"
@@ -1365,7 +1314,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:138
+#: dh:87
 #, no-wrap
 msgid ""
 "\toverride_dh_strip:\n"
@@ -1374,7 +1323,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:141
+#: dh:90
 #, no-wrap
 msgid ""
 "\toverride_dh_installdocs:\n"
@@ -1383,7 +1332,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:144
+#: dh:93
 msgid ""
 "Sometimes the automated L<dh_auto_configure(1)> and L<dh_auto_build(1)> "
 "can't guess what to do for a strange package. Here's how to avoid running "
@@ -1391,7 +1340,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:152
+#: dh:101
 #, no-wrap
 msgid ""
 "\toverride_dh_auto_configure:\n"
@@ -1400,7 +1349,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:155
+#: dh:104
 #, no-wrap
 msgid ""
 "\toverride_dh_auto_build:\n"
@@ -1409,14 +1358,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:158
+#: dh:107
 msgid ""
 "Another common case is wanting to do something manually before or after a "
 "particular debhelper command is run."
 msgstr ""
 
 #. type: verbatim
-#: dh:165
+#: dh:114
 #, no-wrap
 msgid ""
 "\toverride_dh_fixperms:\n"
@@ -1426,7 +1375,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:169
+#: dh:118
 msgid ""
 "Python tools are not run by dh by default, due to the continual change in "
 "that area. (Before compatability level v9, dh does run B<dh_pysupport>.)  "
@@ -1434,7 +1383,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:173
+#: dh:122
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -1444,7 +1393,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:177
+#: dh:126
 msgid ""
 "If your package uses autotools and you want to freshen F<config.sub> and "
 "F<config.guess> with newer versions from the B<autotools-dev> package at "
@@ -1453,7 +1402,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:182
+#: dh:131
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -1463,14 +1412,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:186
+#: dh:135
 msgid ""
 "Here is how to force use of Perl's B<Module::Build> build system, which can "
 "be necessary if debhelper wrongly detects that the package uses MakeMaker."
 msgstr ""
 
 #. type: verbatim
-#: dh:190
+#: dh:139
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -1479,27 +1428,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: verbatim
-#: dh:194
-#, no-wrap
-msgid ""
-"To patch your package using quilt, you can tell B<dh> to use quilt's B<dh>\n"
-"sequence addons like this:\n"
-"\t\n"
-msgstr ""
-
-#. type: verbatim
-#: dh:197
-#, no-wrap
-msgid ""
-"\t#!/usr/bin/make -f\n"
-"\t%:\n"
-"\t\tdh $@ --with quilt\n"
-"\n"
-msgstr ""
-
 #. type: textblock
-#: dh:201
+#: dh:143
 msgid ""
 "Here is an example of overriding where the B<dh_auto_>I<*> commands find the "
 "package's source, for a package where the source is located in a "
@@ -1507,7 +1437,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:205
+#: dh:147
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -1517,14 +1447,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:209
+#: dh:151
 msgid ""
 "And here is an example of how to tell the B<dh_auto_>I<*> commands to build "
 "in a subdirectory, which will be removed on B<clean>."
 msgstr ""
 
 #. type: verbatim
-#: dh:212
+#: dh:154
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -1534,14 +1464,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:216
+#: dh:158
 msgid ""
 "If your package can be built in parallel, you can support parallel building "
 "as follows. Then B<dpkg-buildpackage -j> will work."
 msgstr ""
 
 #. type: verbatim
-#: dh:219
+#: dh:161
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -1551,14 +1481,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:223
+#: dh:165
 msgid ""
 "Here is a way to prevent B<dh> from running several commands that you don't "
 "want it to run, by defining empty override targets for each command."
 msgstr ""
 
 #. type: verbatim
-#: dh:226 dh:237 dh:254
+#: dh:168 dh:179 dh:196
 #, no-wrap
 msgid ""
 "\t#!/usr/bin/make -f\n"
@@ -1568,7 +1498,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:230
+#: dh:172
 #, no-wrap
 msgid ""
 "\t# Commands not to run:\n"
@@ -1577,7 +1507,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:233
+#: dh:175
 msgid ""
 "Sometimes, you may need to make an override target only run commands when a "
 "particular package is being built. This can be accomplished using "
@@ -1585,7 +1515,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:241
+#: dh:183
 #, no-wrap
 msgid ""
 "\toverride_dh_fixperms:\n"
@@ -1597,7 +1527,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:247
+#: dh:189
 msgid ""
 "Finally, remember that you are not limited to using override targets in the "
 "rules file when using B<dh>. You can also explicitly define any of the "
@@ -1608,7 +1538,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: dh:258
+#: dh:200
 #, no-wrap
 msgid ""
 "\tbuild-indep:\n"
@@ -1619,7 +1549,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:263
+#: dh:205
 msgid ""
 "Note that in the example above, dh will arrange for \"debian/rules build\" "
 "to call your build-indep and build-arch targets. You do not need to "
@@ -1629,19 +1559,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: dh:269
+#: dh:211
 msgid "INTERNALS"
 msgstr ""
 
 #. type: textblock
-#: dh:271
+#: dh:213
 msgid ""
 "If you're curious about B<dh>'s internals, here's how it works under the "
 "hood."
 msgstr ""
 
 #. type: textblock
-#: dh:273
+#: dh:215
 msgid ""
 "Each debhelper command will record when it's successfully run in "
 "F<debian/package.debhelper.log>. (Which B<dh_clean> deletes.) So B<dh> can "
@@ -1650,7 +1580,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:278
+#: dh:220
 msgid ""
 "Each time B<dh> is run, it examines the log, and finds the last logged "
 "command that is in the specified sequence. It then continues with the next "
@@ -1659,14 +1589,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:283
+#: dh:225
 msgid ""
 "A sequence can also run dependent targets in debian/rules.  For example, the "
 "\"binary\" sequence runs the \"install\" target."
 msgstr ""
 
 #. type: textblock
-#: dh:286
+#: dh:228
 msgid ""
 "B<dh> uses the B<DH_INTERNAL_OPTIONS> environment variable to pass "
 "information through to debhelper commands that are run inside override "
@@ -1674,13 +1604,74 @@ msgid ""
 "as the name might suggest, is subject to change at any time."
 msgstr ""
 
+#. type: =head1
+#: dh:233
+msgid "DEPRECATED OPTIONS"
+msgstr ""
+
+#. type: textblock
+#: dh:235
+msgid ""
+"The following options are deprecated. It's much better to use override "
+"targets instead."
+msgstr ""
+
+#. type: =item
+#: dh:240
+msgid "B<--until> I<cmd>"
+msgstr ""
+
+#. type: textblock
+#: dh:242
+msgid "Run commands in the sequence until and including I<cmd>, then stop."
+msgstr ""
+
+#. type: =item
+#: dh:244
+msgid "B<--before> I<cmd>"
+msgstr ""
+
+#. type: textblock
+#: dh:246
+msgid "Run commands in the sequence before I<cmd>, then stop."
+msgstr ""
+
+#. type: =item
+#: dh:248
+msgid "B<--after> I<cmd>"
+msgstr ""
+
+#. type: textblock
+#: dh:250
+msgid "Run commands in the sequence that come after I<cmd>."
+msgstr ""
+
+#. type: =item
+#: dh:252
+msgid "B<--remaining>"
+msgstr ""
+
+#. type: textblock
+#: dh:254
+msgid "Run all commands in the sequence that have yet to be run."
+msgstr ""
+
+#. type: textblock
+#: dh:258
+msgid ""
+"In the above options, I<cmd> can be a full name of a debhelper command, or a "
+"substring. It'll first search for a command in the sequence exactly matching "
+"the name, to avoid any ambiguity. If there are multiple substring matches, "
+"the last one in the sequence will be used."
+msgstr ""
+
 #. type: textblock
-#: dh:868 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:55 dh_auto_install:87 dh_auto_test:60 dh_builddeb:125 dh_clean:144 dh_compress:208 dh_fixperms:131 dh_gconf:101 dh_gencontrol:84 dh_install:281 dh_installcatalogs:118 dh_installchangelogs:173 dh_installcron:79 dh_installdeb:146 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:309 dh_installemacsen:126 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:79 dh_installinit:277 dh_installlogcheck:78 dh_installlogrotate:52 dh_installman:260 dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_listpackages:32 dh_makeshlibs:260 dh_md5sums:92 dh_movefiles:172 dh_perl:148 dh_prep:62 dh_python:282 dh_strip:232 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_undocumented:30 dh_usrlocal:116
+#: dh:860 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:55 dh_auto_install:87 dh_auto_test:61 dh_builddeb:122 dh_clean:144 dh_compress:208 dh_fixperms:131 dh_gconf:101 dh_gencontrol:84 dh_install:281 dh_installcatalogs:118 dh_installchangelogs:173 dh_installcron:79 dh_installdeb:146 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:309 dh_installemacsen:126 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:79 dh_installinit:277 dh_installlogcheck:78 dh_installlogrotate:52 dh_installman:261 dh_installmanpages:199 dh_installmime:97 dh_installmodules:126 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_listpackages:32 dh_makeshlibs:260 dh_md5sums:92 dh_movefiles:172 dh_perl:148 dh_prep:62 dh_python:282 dh_strip:232 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_undocumented:30 dh_usrlocal:116
 msgid "L<debhelper(7)>"
 msgstr ""
 
 #. type: textblock
-#: dh:870 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:57 dh_auto_install:89 dh_auto_test:62 dh_bugfiles:128 dh_builddeb:127 dh_clean:146 dh_compress:210 dh_desktop:35 dh_fixperms:133 dh_gconf:103 dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:175 dh_installcron:81 dh_installdeb:148 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:311 dh_installemacsen:128 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:81 dh_installinit:279 dh_installlogrotate:54 dh_installman:262 dh_installmanpages:201 dh_installmenu:93 dh_installmime:99 dh_installmodules:128 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_lintian:61 dh_listpackages:34 dh_makeshlibs:262 dh_md5sums:94 dh_movefiles:174 dh_perl:150 dh_prep:64 dh_python:284 dh_scrollkeeper:32 dh_shlibdeps:175 dh_strip:234 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118
+#: dh:862 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:57 dh_auto_install:89 dh_auto_test:63 dh_bugfiles:128 dh_builddeb:124 dh_clean:146 dh_compress:210 dh_desktop:35 dh_fixperms:133 dh_gconf:103 dh_gencontrol:86 dh_icons:69 dh_install:283 dh_installchangelogs:175 dh_installcron:81 dh_installdeb:148 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:311 dh_installemacsen:128 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:81 dh_installinit:279 dh_installlogrotate:54 dh_installman:263 dh_installmanpages:201 dh_installmenu:93 dh_installmime:99 dh_installmodules:128 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_lintian:61 dh_listpackages:34 dh_makeshlibs:262 dh_md5sums:94 dh_movefiles:174 dh_perl:150 dh_prep:64 dh_python:284 dh_scrollkeeper:32 dh_shlibdeps:175 dh_strip:234 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr ""
 
@@ -1715,14 +1706,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_auto_build:30 dh_auto_clean:32 dh_auto_configure:33 dh_auto_install:45 dh_auto_test:32
+#: dh_auto_build:30 dh_auto_clean:32 dh_auto_configure:33 dh_auto_install:45 dh_auto_test:33
 msgid ""
 "See L<debhelper(7)/B<BUILD SYSTEM OPTIONS>> for a list of common build "
 "system selection and control options."
 msgstr ""
 
 #. type: =item
-#: dh_auto_build:35 dh_auto_clean:37 dh_auto_configure:38 dh_auto_install:56 dh_auto_test:37 dh_builddeb:35 dh_gencontrol:30 dh_installdebconf:69 dh_installinit:99 dh_makeshlibs:91 dh_shlibdeps:37
+#: dh_auto_build:35 dh_auto_clean:37 dh_auto_configure:38 dh_auto_install:56 dh_auto_test:38 dh_builddeb:35 dh_gencontrol:30 dh_installdebconf:69 dh_installinit:99 dh_makeshlibs:91 dh_shlibdeps:37
 msgid "B<--> I<params>"
 msgstr ""
 
@@ -1898,14 +1889,14 @@ msgid "dh_auto_test - automatically runs a package's test suites"
 msgstr ""
 
 #. type: textblock
-#: dh_auto_test:14
+#: dh_auto_test:15
 msgid ""
 "B<dh_auto_test> [S<I<build system options>>] [S<I<debhelper options>>] "
 "[S<B<--> I<params>>]"
 msgstr ""
 
 #. type: textblock
-#: dh_auto_test:18
+#: dh_auto_test:19
 msgid ""
 "B<dh_auto_test> is a debhelper program that tries to automatically run a "
 "package's test suite. It does so by running the appropriate command for the "
@@ -1917,7 +1908,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_auto_test:26
+#: dh_auto_test:27
 msgid ""
 "This is intended to work for about 90% of packages with a test suite. If it "
 "doesn't work, you're encouraged to skip using B<dh_auto_test> at all, and "
@@ -1925,14 +1916,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_auto_test:39
+#: dh_auto_test:40
 msgid ""
 "Pass I<params> to the program that is run. These can be used to supplement "
 "or override the any standard parameters that B<dh_auto_test> passes."
 msgstr ""
 
 #. type: textblock
-#: dh_auto_test:46
+#: dh_auto_test:47
 msgid ""
 "If the B<DEB_BUILD_OPTIONS> environment variable contains B<nocheck>, no "
 "tests will be performed."
@@ -2969,7 +2960,7 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: dh_installcron:44 dh_installifupdown:43 dh_installinit:104 dh_installlogcheck:46 dh_installlogrotate:26 dh_installmodules:52 dh_installpam:35 dh_installppp:39 dh_installudev:39
+#: dh_installcron:44 dh_installifupdown:43 dh_installinit:104 dh_installlogcheck:44 dh_installlogrotate:26 dh_installmodules:52 dh_installpam:35 dh_installppp:39 dh_installudev:39
 msgid "B<--name=>I<name>"
 msgstr ""
 
@@ -3932,7 +3923,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_installlogcheck:48
+#: dh_installlogcheck:46
 msgid ""
 "Look for files named F<debian/package.name.logcheck.*> and install them into "
 "the corresponding subdirectories of F<etc/logcheck/>, but use the specified "