I lied, one more v7 change slipped in..

* dh_installchangelogs: In v7 mode, if no upstream changelog is specified,
  and the package is not native, guess at a few common changelog filenames.

1 files changed, 79 insertions, 67 deletions

diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index 8e102e7c..5c325ecd 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: 2008-04-23 21:24-0400\n"
+"POT-Creation-Date: 2008-04-24 00:14-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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 # type: =head1
-#: debhelper.pod:1 dh_builddeb:3 dh_compress:3 dh_desktop:3 dh_fixperms:3 dh_gconf:3 dh_gencontrol:3 dh_installcatalogs:3 dh_installchangelogs:3 dh_installcron:3 dh_installdebconf:3 dh_installdeb:3 dh_installdirs:3 dh_installdocs:3 dh_installemacsen:3 dh_installexamples:3 dh_installinfo:3 dh_installinit:3 dh_installlogcheck:3 dh_installlogrotate:3 dh_installmanpages:3 dh_installman:3 dh_installmenu:3 dh_installmime:3 dh_installmodules:3 dh_installpam:3 dh_install:3 dh_installppp:3 dh_installwm:3 dh_installxfonts:3 dh_link:3 dh_listpackages:3 dh_makeshlibs:3 dh_md5sums:3 dh_movefiles:3 dh_perl:3 dh_python:3 dh_scrollkeeper:3 dh_shlibdeps:3 dh_strip:3 dh_suidregister:3 dh_testdir:3 dh_testroot:3 dh_testversion:3 dh_undocumented:3 dh_usrlocal:3
+#: debhelper.pod:1 dh_builddeb:3 dh_clean:3 dh_compress:3 dh_desktop:3 dh_fixperms:3 dh_gconf:3 dh_gencontrol:3 dh_installcatalogs:3 dh_installchangelogs:3 dh_installcron:3 dh_installdebconf:3 dh_installdeb:3 dh_installdirs:3 dh_installdocs:3 dh_installemacsen:3 dh_installexamples:3 dh_installinfo:3 dh_installinit:3 dh_installlogcheck:3 dh_installlogrotate:3 dh_installmanpages:3 dh_installman:3 dh_installmenu:3 dh_installmime:3 dh_installmodules:3 dh_installpam:3 dh_install:3 dh_installppp:3 dh_installwm:3 dh_installxfonts:3 dh_link:3 dh_listpackages:3 dh_makeshlibs:3 dh_md5sums:3 dh_movefiles:3 dh_perl:3 dh_python:3 dh_scrollkeeper:3 dh_shlibdeps:3 dh_strip:3 dh_suidregister:3 dh_testdir:3 dh_testroot:3 dh_testversion:3 dh_undocumented:3 dh_usrlocal:3
 msgid "NAME"
 msgstr ""
 
@@ -574,7 +574,7 @@ msgid "This mode works like V2, with the following additions:"
 msgstr ""
 
 # type: =item
-#: debhelper.pod:292 debhelper.pod:297 debhelper.pod:301 debhelper.pod:315 debhelper.pod:320 debhelper.pod:325 debhelper.pod:330 debhelper.pod:342 debhelper.pod:346 debhelper.pod:351 debhelper.pod:355 debhelper.pod:367 debhelper.pod:372 debhelper.pod:378 debhelper.pod:384 debhelper.pod:399 debhelper.pod:406
+#: debhelper.pod:292 debhelper.pod:297 debhelper.pod:301 debhelper.pod:315 debhelper.pod:320 debhelper.pod:325 debhelper.pod:330 debhelper.pod:342 debhelper.pod:346 debhelper.pod:351 debhelper.pod:355 debhelper.pod:367 debhelper.pod:372 debhelper.pod:378 debhelper.pod:384 debhelper.pod:399 debhelper.pod:406 debhelper.pod:410 debhelper.pod:414
 msgid "-"
 msgstr ""
 
@@ -731,13 +731,25 @@ msgstr ""
 msgid "dh_clean will read debian/clean and delete files listed there."
 msgstr ""
 
+# type: textblock
+#: debhelper.pod:412
+msgid "dh_clean will delete toplevel *-stamp files."
+msgstr ""
+
+# type: textblock
+#: debhelper.pod:416
+msgid ""
+"dh_installchangelogs will guess at what file is the upstream changelog if "
+"none is specified."
+msgstr ""
+
 # type: =head2
-#: debhelper.pod:414
+#: debhelper.pod:423
 msgid "Doc directory symlinks"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:416
+#: debhelper.pod:425
 msgid ""
 "Sometimes it is useful to make a package not contain a "
 "/usr/share/doc/package directory at all, instead placing just a dangling "
@@ -751,12 +763,12 @@ msgid ""
 msgstr ""
 
 # type: =head2
-#: debhelper.pod:425
+#: debhelper.pod:434
 msgid "udebs"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:427
+#: debhelper.pod:436
 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 "
@@ -767,12 +779,12 @@ msgid ""
 msgstr ""
 
 # type: =head2
-#: debhelper.pod:434
+#: debhelper.pod:443
 msgid "Other notes"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:436
+#: debhelper.pod:445
 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 "
@@ -783,7 +795,7 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:442
+#: debhelper.pod:451
 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 "
@@ -792,7 +804,7 @@ msgid ""
 msgstr ""
 
 # type: verbatim
-#: debhelper.pod:448
+#: debhelper.pod:457
 #, no-wrap
 msgid ""
 "  Build-Depends: debhelper (>= 7)\n"
@@ -800,51 +812,51 @@ msgid ""
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:450
+#: debhelper.pod:459
 msgid "ENVIRONMENT"
 msgstr ""
 
 # type: =item
-#: debhelper.pod:454
+#: debhelper.pod:463
 msgid "DH_VERBOSE"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:456
+#: debhelper.pod:465
 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:459
+#: debhelper.pod:468
 msgid "DH_COMPAT"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:461
+#: debhelper.pod:470
 msgid ""
 "Temporarily specifies what compatibility level debhelper should run at, "
 "overriding any value in debian/compat."
 msgstr ""
 
 # type: =item
-#: debhelper.pod:464
+#: debhelper.pod:473
 msgid "DH_NO_ACT"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:466
+#: debhelper.pod:475
 msgid "Set to 1 to enable no-act mode."
 msgstr ""
 
 # type: =item
-#: debhelper.pod:468
+#: debhelper.pod:477
 msgid "DH_OPTIONS"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:470
+#: debhelper.pod:479
 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 "
@@ -854,12 +866,12 @@ msgid ""
 msgstr ""
 
 # type: =item
-#: debhelper.pod:476
+#: debhelper.pod:485
 msgid "DH_ALWAYS_EXCLUDE"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:478
+#: debhelper.pod:487
 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 "
@@ -867,7 +879,7 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:482
+#: debhelper.pod:491
 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 "
@@ -878,44 +890,44 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:489
+#: debhelper.pod:498
 msgid ""
 "Multiple things to exclude can be separated with colons, as in "
 "DH_ALWAYS_EXCLUDE=CVS:.svn"
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:494 dh_builddeb:85 dh_clean:121 dh_compress:189 dh_desktop:47 dh_fixperms:110 dh_gconf:90 dh_gencontrol:73 dh_installcatalogs:111 dh_installchangelogs:125 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:109 dh_installexamples:103 dh_installinfo:103 dh_installinit:197 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:249 dh_installmenu:80 dh_installmime:85 dh_installmodules:116 dh_installpam:52 dh_install:268 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:28 dh_makeshlibs:222 dh_md5sums:86 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:159 dh_strip:224 dh_suidregister:117 dh_testdir:43 dh_testroot:26 dh_testversion:74 dh_undocumented:28 dh_usrlocal:114
+#: debhelper.pod:503 dh_builddeb:85 dh_clean:126 dh_compress:189 dh_desktop:47 dh_fixperms:110 dh_gconf:90 dh_gencontrol:73 dh_installcatalogs:111 dh_installchangelogs:138 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:109 dh_installexamples:103 dh_installinfo:103 dh_installinit:197 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:249 dh_installmenu:80 dh_installmime:85 dh_installmodules:116 dh_installpam:52 dh_install:268 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:28 dh_makeshlibs:222 dh_md5sums:86 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:159 dh_strip:224 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:498
+#: debhelper.pod:507
 msgid "F</usr/share/doc/debhelper/examples/>"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:500
+#: debhelper.pod:509
 msgid "A set of example debian/rules files that use debhelper."
 msgstr ""
 
 # type: =item
-#: debhelper.pod:502
+#: debhelper.pod:511
 msgid "L<http://kitenet.net/~joey/code/debhelper/>"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:504
+#: debhelper.pod:513
 msgid "Debhelper web site."
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:508 dh_builddeb:91 dh_clean:127 dh_compress:195 dh_desktop:53 dh_fixperms:116 dh_gconf:96 dh_gencontrol:79 dh_installcatalogs:117 dh_installchangelogs:131 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 dh_installemacsen:115 dh_installexamples:109 dh_installinfo:109 dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:255 dh_installmenu:88 dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:274 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:34 dh_makeshlibs:228 dh_md5sums:92 dh_movefiles:168 dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:165 dh_strip:230 dh_suidregister:123 dh_testdir:49 dh_testroot:32 dh_testversion:80 dh_undocumented:34 dh_usrlocal:120
+#: debhelper.pod:517 dh_builddeb:91 dh_clean:132 dh_compress:195 dh_desktop:53 dh_fixperms:116 dh_gconf:96 dh_gencontrol:79 dh_installcatalogs:117 dh_installchangelogs:144 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 dh_installemacsen:115 dh_installexamples:109 dh_installinfo:109 dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:255 dh_installmenu:88 dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:274 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:34 dh_makeshlibs:228 dh_md5sums:92 dh_movefiles:168 dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:165 dh_strip:230 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:510 dh_builddeb:93 dh_clean:129 dh_compress:197 dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:133 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:245 dh_installemacsen:117 dh_installexamples:111 dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:257 dh_installmenu:90 dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:276 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:36 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170 dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:51 dh_testroot:34 dh_testversion:82 dh_undocumented:36
+#: debhelper.pod:519 dh_builddeb:93 dh_clean:134 dh_compress:197 dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:146 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:245 dh_installemacsen:117 dh_installexamples:111 dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:257 dh_installmenu:90 dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:276 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:36 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170 dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:51 dh_testroot:34 dh_testversion:82 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr ""
 
@@ -939,7 +951,7 @@ msgid ""
 msgstr ""
 
 # type: =head1
-#: dh_builddeb:21 dh_clean:30 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:28 dh_installdocs:51 dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40 dh_installman:58 dh_installmenu:34 dh_installmime:31 dh_installmodules:39 dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48 dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39 dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39
+#: dh_builddeb:21 dh_clean:30 dh_compress:38 dh_fixperms:31 dh_gconf:34 dh_gencontrol:26 dh_installcatalogs:44 dh_installchangelogs:44 dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51 dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37 dh_installinit:33 dh_installlogrotate:22 dh_installmanpages:40 dh_installman:58 dh_installmenu:34 dh_installmime:31 dh_installmodules:39 dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48 dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39 dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39
 msgid "OPTIONS"
 msgstr ""
 
@@ -983,16 +995,21 @@ msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
 msgstr ""
 
 # type: textblock
-#: dh_builddeb:87 dh_clean:123 dh_compress:191 dh_fixperms:112 dh_gconf:92 dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:127 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:239 dh_installemacsen:111 dh_installexamples:105 dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:251 dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:270 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:30 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164 dh_perl:154 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:45 dh_testroot:28 dh_testversion:76 dh_undocumented:30 dh_usrlocal:116
+#: dh_builddeb:87 dh_clean:128 dh_compress:191 dh_fixperms:112 dh_gconf:92 dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:140 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:239 dh_installemacsen:111 dh_installexamples:105 dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:251 dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:270 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:30 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164 dh_perl:154 dh_python:284 dh_strip:226 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:89 dh_clean:125 dh_compress:193 dh_desktop:51 dh_fixperms:114 dh_gconf:94 dh_gencontrol:77 dh_installchangelogs:129 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 dh_installemacsen:113 dh_installexamples:107 dh_installinfo:107 dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:253 dh_installmenu:86 dh_installmime:89 dh_installmodules:120 dh_installpam:56 dh_install:272 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:32 dh_makeshlibs:226 dh_md5sums:90 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:163 dh_strip:228 dh_suidregister:121 dh_testdir:47 dh_testroot:30 dh_testversion:78 dh_undocumented:32 dh_usrlocal:118
+#: dh_builddeb:89 dh_clean:130 dh_compress:193 dh_desktop:51 dh_fixperms:114 dh_gconf:94 dh_gencontrol:77 dh_installchangelogs:142 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 dh_installemacsen:113 dh_installexamples:107 dh_installinfo:107 dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:253 dh_installmenu:86 dh_installmime:89 dh_installmodules:120 dh_installpam:56 dh_install:272 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:32 dh_makeshlibs:226 dh_md5sums:90 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:163 dh_strip:228 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 ""
 
 # type: textblock
+#: dh_clean:5
+msgid "dh_clean - clean up package build directories"
+msgstr ""
+
+# type: textblock
 #: dh_clean:14
 msgid ""
 "B<dh_clean> [S<I<debhelper options>>] [B<-k>] [B<-d>] [B<-X>I<item>] "
@@ -1011,7 +1028,7 @@ msgid ""
 "debhelper commands. It also removes common files that should not appear in "
 "a\n"
 "debian diff:\n"
-"  #*# *~ DEADJOE *.orig *.rej *.SUMS TAGS .deps/* *.P\n"
+"  #*# *~ DEADJOE *.orig *.rej *.SUMS TAGS .deps/* *.P *-stamp\n"
 "\n"
 msgstr ""
 
@@ -1028,41 +1045,36 @@ msgid "The debian/clean file can list other files to be removed."
 msgstr ""
 
 # type: =item
-#: dh_clean:34 dh_installchangelogs:44
+#: dh_clean:34 dh_installchangelogs:48
 msgid "B<-k>, B<--keep>"
 msgstr ""
 
 # type: textblock
 #: dh_clean:36
 msgid ""
-"Do not delete debian/files, or files listed in debian/clean. When do you "
-"want to use this? Anytime you have a debian/rules that has 2 binary targets "
-"that build different .deb packages; for example, one target is binary-arch, "
-"and the other is binary-indep, or one target builds the shared library, and "
-"the other the -dev package. If you didn't use -k in these cases, then "
-"debian/files would be deleted in the middle, and your changes file will only "
-"contain the last binary package that was built."
+"This causes L<dh_prep(1)> to be run instead of dh_clean, for backwards "
+"compatibility."
 msgstr ""
 
 # type: =item
-#: dh_clean:44
+#: dh_clean:39
 msgid "B<-d>, B<--dirs-only>"
 msgstr ""
 
 # type: textblock
-#: dh_clean:46
+#: dh_clean:41
 msgid ""
 "Only clean the package build directories, do not clean up any other files at "
 "all."
 msgstr ""
 
 # type: =item
-#: dh_clean:49
+#: dh_clean:44
 msgid "B<-X>I<item> B<--exclude=>I<item>"
 msgstr ""
 
 # type: textblock
-#: dh_clean:51
+#: dh_clean:46
 msgid ""
 "Exclude files that contain \"item\" anywhere in their filename from being "
 "deleted, even if they would normally be deleted. You may use this option "
@@ -1070,12 +1082,12 @@ msgid ""
 msgstr ""
 
 # type: =item
-#: dh_clean:55 dh_compress:55 dh_installdocs:69 dh_installexamples:38 dh_installinfo:50 dh_installmanpages:44 dh_movefiles:49 dh_testdir:27
+#: dh_clean:50 dh_compress:55 dh_installdocs:69 dh_installexamples:38 dh_installinfo:50 dh_installmanpages:44 dh_movefiles:49 dh_testdir:27
 msgid "I<file ...>"
 msgstr ""
 
 # type: textblock
-#: dh_clean:57
+#: dh_clean:52
 msgid "Delete these files too."
 msgstr ""
 
@@ -1396,9 +1408,9 @@ 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:58 dh_installwm:53 dh_scrollkeeper:44 dh_usrlocal:51
+#: dh_installcatalogs:56 dh_installdocs:93 dh_installemacsen:56 dh_installinfo:59 dh_installinit:101 dh_installmime:43 dh_installmodules:58 dh_installwm:53 dh_scrollkeeper:44 dh_usrlocal:51
 msgid ""
-"Note that this command is not idempotent. \"dh_clean -k\" should be called "
+"Note that this command is not idempotent. L<dh_prep(1)> should be called "
 "between invocations of this command. Otherwise, it may cause multiple "
 "instances of the same text to be added to maintainer scripts."
 msgstr ""
@@ -1453,16 +1465,24 @@ msgstr ""
 # type: textblock
 #: dh_installchangelogs:33
 msgid ""
-"If an upstream changelog file is specified as an option, then this upstream "
-"changelog will be installed as usr/share/doc/package/changelog in the "
-"package build directory. If the changelog is a html file (determined by file "
-"extension), it will be installed as usr/share/doc/package/changelog.html "
-"instead, and will be converted to plain text with html2text to generate "
+"An upstream changelog file may be specified as an option. If none is "
+"specified, a few common filenames are tried. (In compatability level 7 and "
+"above.)"
+msgstr ""
+
+# type: textblock
+#: dh_installchangelogs:37
+msgid ""
+"If there is an upstream changelog file, it will be be installed as "
+"usr/share/doc/package/changelog in the package build directory. If the "
+"changelog is a html file (determined by file extension), it will be "
+"installed as usr/share/doc/package/changelog.html instead, and will be "
+"converted to plain text with html2text to generate "
 "usr/share/doc/package/changelog."
 msgstr ""
 
 # type: textblock
-#: dh_installchangelogs:46
+#: dh_installchangelogs:50
 msgid ""
 "Keep the original name of the upstream changelog. This will be accomplished "
 "by installing the upstream changelog as \"changelog\", and making a symlink "
@@ -1472,12 +1492,12 @@ msgid ""
 msgstr ""
 
 # type: =item
-#: dh_installchangelogs:52
+#: dh_installchangelogs:56
 msgid "I<upstream>"
 msgstr ""
 
 # type: textblock
-#: dh_installchangelogs:54
+#: dh_installchangelogs:58
 msgid "Install this file as the upstream changelog."
 msgstr ""
 
@@ -1833,14 +1853,6 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: dh_installdocs:93
-msgid ""
-"Note that this command is not idempotent. \"dh_clean B<-k>\" should be "
-"called between invocations of this command. Otherwise, it may cause multiple "
-"instances of the same text to be added to maintainer scripts."
-msgstr ""
-
-# type: textblock
 #: dh_installemacsen:5
 msgid "dh_installemacsen - register an emacs add on package"
 msgstr ""