Merge branch 'wheezy'

Conflicts:
	man/po4a/po/de.po

diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index ad473a3916085aa6ad69ec44f8b8a42609e2a2ed..81cff3c9fc8fe15689605f800964f585a0725dbd 100644 (file)
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -118,9 +118,23 @@ sub setup_py {
        # extensions for each.
 
        my $python_default = `pyversions -d`;
+       if ($? == -1) {
+               error("failed to run pyversions")
+       }
+       my $ecode = $? >> 8;
+       if ($ecode != 0) {
+               error("pyversions -d failed [$ecode]")
+       }
        $python_default =~ s/^\s+//;
        $python_default =~ s/\s+$//;
-       my @python_requested = split ' ', `pyversions -r 2>/dev/null`;
+       my @python_requested = split ' ', `pyversions -r`;
+       if ($? == -1) {
+               error("failed to run pyversions")
+       }
+       $ecode = $? >> 8;
+       if ($ecode != 0) {
+               error("pyversions -r failed [$ecode]")
+       }
        if (grep /^\Q$python_default\E/, @python_requested) {
                @python_requested = (
                        grep(!/^\Q$python_default\E/, @python_requested),
@@ -141,7 +155,7 @@ sub setup_py {
        }
 
        foreach my $python (@python_dbg, @python_requested) {
-               if (-x "/usr/bin/".$python) {
+               if (-f "/usr/lib/$python/distutils/__init__.py") {
                        # To allow backports of debhelper we don't pass
                        # --install-layout=deb to 'setup.py install` for
                        # those Python versions where the option is

diff --git a/autoscripts/postinst-mime b/autoscripts/postinst-mime
deleted file mode 100644 (file)
index 3749fc9..0000000
--- a/autoscripts/postinst-mime
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "configure" ] && [ -x "`which update-mime 2>/dev/null`" ]; then
-       update-mime
-fi

diff --git a/autoscripts/postinst-sharedmimeinfo b/autoscripts/postinst-sharedmimeinfo
deleted file mode 100644 (file)
index aa6333f..0000000
--- a/autoscripts/postinst-sharedmimeinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "configure" ] && [ -x "`which update-mime-database 2>/dev/null`" ]; then
-       update-mime-database /usr/share/mime
-fi

diff --git a/autoscripts/postrm-mime b/autoscripts/postrm-mime
deleted file mode 100644 (file)
index a940411..0000000
--- a/autoscripts/postrm-mime
+++ /dev/null
@@ -1 +0,0 @@
-if which update-mime >/dev/null 2>&1; then update-mime; fi

diff --git a/autoscripts/postrm-sharedmimeinfo b/autoscripts/postrm-sharedmimeinfo
deleted file mode 100644 (file)
index 917fd49..0000000
--- a/autoscripts/postrm-sharedmimeinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x "`which update-mime-database 2>/dev/null`" ]; then
-       update-mime-database /usr/share/mime
-fi

diff --git a/debhelper.pod b/debhelper.pod
index 511b21f4a09cc569d2bfeda5b03c128c28df714d..e5794c485315b9bb30f31293ad6ea5bda5a3a8bc 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -185,7 +185,8 @@ Do not modify F<postinst>, F<postrm>, etc. scripts.
 =item B<-X>I<item>, B<--exclude=>I<item>
 
 Exclude an item from processing. This option may be used multiple times,
-to exclude more than one thing.
+to exclude more than one thing. The \fIitem\fR is typically part of a
+filename, and any file containing the specified text will be excluded.
 
 =item B<-A>, B<--all>
 

diff --git a/debian/changelog b/debian/changelog
index bb2773a3058a43542dd222f521d19020761510de..2ff9bfa60e06fe5ae3db9d26c79310abf9880397 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+debhelper (9.20120609) UNRELEASED; urgency=low
+
+  * dh_shlibdeps: Warn if -V flag is passed, to avoid it accidentially being
+    used here rather than in dh_makeshlibs. Closes: #680339
+  * dh_lintian: Source overrides doc improvement. Closes: #683941
+  * dh_installmime: No longer makes maintainer scripts run update-mime and
+    update-mime-database, that is now handled by triggers. Closes: #684689
+    Thanks, Charles Plessy
+  * python distutils buildsystem: Propigate failure of pyversions.
+    Closes: #683551 Thanks, Clint Byrum
+  * python distutils buildsystem: When checking if a version of python is
+    installed, don't trust the presense of the executable, as
+    a python2.X-minimal package may provide it while not having
+    distutils installed. Closes: #683557
+  * dh_icons: Improve documentation. Closes: #684895
+  * Improve -X documentation. Closes: #686696
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 05 Jul 2012 08:51:07 -0600
+
 debhelper (9.20120909) unstable; urgency=low
 
   * autoscript() can now be passed a perl sub to run to s/// lines of

diff --git a/dh_icons b/dh_icons
index 3ac091afb4d4f7f4b3fe0f91cf703c23cd288db1..05d63d1f953e2a5199cad8e7b3a4a68da205b29f 100755 (executable)
--- a/dh_icons
+++ b/dh_icons
@@ -19,8 +19,13 @@ B<dh_icons> [S<I<debhelper options>>] [B<-n>]
 B<dh_icons> is a debhelper program that updates Freedesktop icon caches
 when needed, using the B<update-icon-caches> program provided by GTK+2.12.
 Currently this program does not handle installation of the files, though it
-may do so at a later date. It takes care of adding maintainer script
-fragments to call B<update-icon-caches>.
+may do so at a later date, so should be run after icons are installed in
+the package build directories. 
+
+It takes care of adding maintainer script fragments to call
+B<update-icon-caches> for icon directories. (This is not done for gnome and
+hicolor icons, as those are handled by triggers.)
+These commands are inserted into the maintainer scripts by L<dh_installdeb(1)>.
 
 =head1 OPTIONS
 

diff --git a/dh_installmime b/dh_installmime
index 998d6bad33d6c7f99a713b1cb003fa42143f923d..d44c9150d7d50df4ce2b1d0645f354be33a864e5 100755 (executable)
--- a/dh_installmime
+++ b/dh_installmime
@@ -11,17 +11,13 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_installmime> [S<I<debhelper options>>] [B<-n>]
+B<dh_installmime> [S<I<debhelper options>>]
 
 =head1 DESCRIPTION
 
 B<dh_installmime> is a debhelper program that is responsible for installing
 mime files into package build directories.
 
-It also automatically generates the F<postinst> and F<postrm> commands needed to
-interface with the debian B<mime-support> and B<shared-mime-info> packages. These
-commands are inserted into the maintainer scripts by L<dh_installdeb(1)>.
-
 =head1 FILES
 
 =over 4
@@ -38,22 +34,6 @@ directory.
 
 =back
 
-=head1 OPTIONS
-
-=over 4
-
-=item B<-n>, B<--noscripts>
-
-Do not modify F<postinst>/F<postrm> scripts.
-
-=back
-
-=head1 NOTES
-
-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.
-
 =cut
 
 init();
@@ -68,12 +48,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
                doit("install","-p","-m644",$mime,"$tmp/usr/lib/mime/packages/$package");
        }
-       # Check whether we have to call update-mime (either upstream already
-       # installs a MIME information file or Debian provides one)
-       if ((! $dh{NOSCRIPTS}) && (-d "$tmp/usr/lib/mime/packages")) {
-               autoscript($package,"postinst","postinst-mime");
-               autoscript($package,"postrm","postrm-mime")
-       }
        
        my $sharedmimeinfo=pkgfile($package,"sharedmimeinfo");
        
@@ -83,13 +57,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
                doit("install", "-p", "-m644", $sharedmimeinfo, "$tmp/usr/share/mime/packages/$package.xml");
        }
-       # check whether we have to call update-mime-database (either upstream
-       # already installs a shared MIME information file or Debian provides
-       # one)
-       if ((! $dh{NOSCRIPTS}) && (-d "$tmp/usr/share/mime/packages")) {
-               autoscript($package, "postinst", "postinst-sharedmimeinfo");
-               autoscript($package, "postrm", "postrm-sharedmimeinfo")
-       }
 }
 
 =head1 SEE ALSO

diff --git a/dh_lintian b/dh_lintian
index 5540ec3337d35e2e8d6302d313b073f4b6525bc3..f7541df7ee2035b6f339ac282a2dc575db3b66cd 100755 (executable)
--- a/dh_lintian
+++ b/dh_lintian
@@ -28,7 +28,7 @@ Installed into usr/share/lintian/overrides/I<package> in the package
 build directory. This file is used to suppress erroneous lintian
 diagnostics.
 
-=item F<debian/source.lintian-overrides>
+=item F<debian/source/lintian-overrides>
 
 These files are not installed, but will be scanned by lintian to provide
 overrides for the source package.

diff --git a/dh_shlibdeps b/dh_shlibdeps
index e941af6cabd204379317180c8180638f96daae3f..a41732fcee1678c9c5a1814334760e2cf25f96f8 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -111,6 +111,10 @@ if ($dh{L_PARAMS}) {
        $dh{L_PARAMS}=join(':', @paths);
 }
 
+if (defined $dh{V_FLAG}) {
+       warning("You probably wanted to pass -V to dh_makeshlibs, it has no effect on dh_shlibdeps");
+}
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);
        my $ext=pkgext($package);

diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index 86a73f4c0ae1c33ead6919a4707c1ffeeae964a5..b36b9722c53cc4b357072f331486e8a0f55d1bfd 100644 (file)
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debhelper 9.20120609\n"
 "Report-Msgid-Bugs-To: debhelper@packages.debian.org\n"
-"POT-Creation-Date: 2012-05-18 11:05-0400\n"
+"POT-Creation-Date: 2012-08-13 17:34-0400\n"
 "PO-Revision-Date: 2012-08-19 22:11+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1595,11 +1595,11 @@ msgstr ""
 "getrennt werden, wie in B<DH_ALWAYS_EXCLUDE=CVS:.svn>."
 
 #. type: =head1
-#: debhelper.pod:674 dh:893 dh_auto_build:47 dh_auto_clean:50
+#: debhelper.pod:674 dh:903 dh_auto_build:47 dh_auto_clean:50
 #: dh_auto_configure:52 dh_auto_install:85 dh_auto_test:59 dh_bugfiles:122
 #: dh_builddeb:124 dh_clean:142 dh_compress:206 dh_desktop:31 dh_fixperms:127
 #: dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:258
-#: dh_installcatalogs:116 dh_installchangelogs:171 dh_installcron:77
+#: dh_installcatalogs:120 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:256
@@ -1608,7 +1608,7 @@ msgstr ""
 #: dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:115
 #: dh_installwm:108 dh_installxfonts:87 dh_link:228 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_perl:146 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:175
 #: dh_strip:242 dh_suidregister:117 dh_testdir:44 dh_testroot:27
 #: dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
@@ -1637,11 +1637,11 @@ msgid "Debhelper web site."
 msgstr "Debhelper-Website"
 
 #. type: =head1
-#: debhelper.pod:688 dh:899 dh_auto_build:53 dh_auto_clean:56
+#: debhelper.pod:688 dh:909 dh_auto_build:53 dh_auto_clean:56
 #: dh_auto_configure:58 dh_auto_install:91 dh_auto_test:65 dh_bugfiles:130
 #: dh_builddeb:130 dh_clean:148 dh_compress:212 dh_desktop:37 dh_fixperms:133
 #: dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:264
-#: dh_installcatalogs:122 dh_installchangelogs:177 dh_installcron:83
+#: dh_installcatalogs:126 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:84
@@ -1650,13 +1650,13 @@ msgstr "Debhelper-Website"
 #: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93
 #: dh_link:234 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:248 dh_suidregister:123
+#: dh_scrollkeeper:34 dh_shlibdeps:181 dh_strip:248 dh_suidregister:123
 #: dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: textblock
-#: debhelper.pod:690 dh:901 dh_auto_build:55 dh_auto_clean:58
+#: debhelper.pod:690 dh:911 dh_auto_build:55 dh_auto_clean:58
 #: dh_auto_configure:60 dh_auto_install:93 dh_auto_test:67 dh_builddeb:132
 #: dh_clean:150 dh_compress:214 dh_fixperms:135 dh_gencontrol:90
 #: dh_install:266 dh_installchangelogs:179 dh_installcron:85 dh_installdeb:152
@@ -1667,7 +1667,7 @@ msgstr "AUTOR"
 #: dh_installmime:103 dh_installmodules:132 dh_installpam:67 dh_installppp:73
 #: dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:236
 #: dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178
-#: dh_prep:68 dh_shlibdeps:179 dh_strip:250 dh_suidregister:125 dh_testdir:52
+#: dh_prep:68 dh_shlibdeps:183 dh_strip:250 dh_suidregister:125 dh_testdir:52
 #: dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -2375,10 +2375,10 @@ msgstr ""
 "der letzte in der Sequenz benutzt."
 
 #. type: textblock
-#: dh:895 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
+#: dh:905 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
 #: dh_auto_install:87 dh_auto_test:61 dh_builddeb:126 dh_clean:144
 #: dh_compress:208 dh_fixperms:129 dh_gconf:101 dh_gencontrol:84
-#: dh_install:260 dh_installcatalogs:118 dh_installchangelogs:173
+#: dh_install:260 dh_installcatalogs:122 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:258
@@ -2393,7 +2393,7 @@ msgid "L<debhelper(7)>"
 msgstr "L<debhelper(7)>"
 
 #. type: textblock
-#: dh:897 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
+#: dh:907 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
 #: dh_auto_install:89 dh_auto_test:63 dh_bugfiles:128 dh_builddeb:128
 #: dh_clean:146 dh_compress:210 dh_desktop:35 dh_fixperms:131 dh_gconf:103
 #: dh_gencontrol:86 dh_icons:69 dh_install:262 dh_installchangelogs:175
@@ -2405,7 +2405,7 @@ msgstr "L<debhelper(7)>"
 #: dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91
 #: dh_link:232 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:246 dh_suidregister:121
+#: dh_scrollkeeper:32 dh_shlibdeps:179 dh_strip:246 dh_suidregister:121
 #: dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr "Dieses Programm ist Teil von Debhelper."
@@ -3821,12 +3821,12 @@ msgstr ""
 "Textes hinzugefügt werden."
 
 #. type: textblock
-#: dh_installcatalogs:120
+#: dh_installcatalogs:124
 msgid "F</usr/share/doc/sgml-base-doc/>"
 msgstr "F</usr/share/doc/sgml-base-doc/>"
 
 #. type: textblock
-#: dh_installcatalogs:124
+#: dh_installcatalogs:128
 msgid "Adam Di Carlo <aph@debian.org>"
 msgstr "Adam Di Carlo <aph@debian.org>"
 
@@ -5286,8 +5286,8 @@ msgstr ""
 "Handbuchseiten an die korrekten Speicherorte in Paketbauverzeichnissen "
 "handhabt. Sie teilen ihm mit, welche Handbuchseiten in Ihr Paket kommen und "
 "es ergründet, wohin sie installiert werden, basierend auf dem Abschnittsfeld "
-"in ihrer B<.TH>- oder B<.Dt>-Zeile. Falls Sie eine ordentlich formatierte B<."
-"TH>- oder B<.Dt>-Zeile haben, wird Ihre Handbuchseite in das richtige "
+"in ihrer B<.TH>- oder B<.Dt>-Zeile. Falls Sie eine ordentlich formatierte "
+"B<.TH>- oder B<.Dt>-Zeile haben, wird Ihre Handbuchseite in das richtige "
 "Verzeichnis mit dem richtigen Namen installiert (dies umfasst eine "
 "ordentliche Handhabung von Seiten mit einem Unterabschnitt wie B<3perl>, die "
 "in F<man3> platziert werden und Angabe einer Erweiterung von F<.3perl>). "
@@ -5318,15 +5318,16 @@ msgid ""
 "B<--language=C> to avoid this."
 msgstr ""
 "Falls B<dh_installman> eine Handbuchseite in den falschen Abschnitt oder mit "
-"der falschen Endung zu installieren scheint, ist dies, weil die "
-"Handbuchseite den falschen Abschnitt in ihrer B<.TH>- oder B<.Dt>-Zeile "
-"aufführt. Bearbeiten Sie die Handbuchseite, korrigieren Sie den Abschnitt "
-"und B<dh_installman> wird passend folgen. Einzelheiten über die B<.TH>-Zeile "
+"der falschen Endung zu installieren scheint, ist dies, weil die Handbuchseite "
+"den falschen Abschnitt in ihrer B<.TH>- oder B<.Dt>-Zeile aufführt. "
+"Bearbeiten Sie die Handbuchseite, korrigieren Sie den Abschnitt und "
+"B<dh_installman> wird passend folgen. Einzelheiten über die B<.TH>-Zeile "
 "finden Sie in L<man(7)> und über die B<.Dt>-Zeile in L<mdoc(7)>. Falls "
-"B<dh_installman> eine Handbuchseite in ein Verzeichnis wie F</usr/share/man/"
-"pl/man1/> zu installieren scheint, ist dies, weil Ihr Programm einen Namen "
-"wie F<foo.pl> hat und B<dh_installman> annimmt, dass dies bedeutet, sie sei "
-"ins Polnische übersetzt. Benutzen Sie B<--language=C>, um dies zu vermeiden."
+"B<dh_installman> eine Handbuchseite in ein Verzeichnis wie "
+"F</usr/share/man/pl/man1/> zu installieren scheint, ist dies, weil Ihr "
+"Programm einen Namen wie F<foo.pl> hat und B<dh_installman> annimmt, dass "
+"dies bedeutet, sie sei ins Polnische übersetzt. Benutzen Sie B<--language=C>, "
+"um dies zu vermeiden."
 
 #. type: textblock
 #: dh_installman:42
@@ -6242,9 +6243,7 @@ msgstr ""
 
 #. type: =item
 #: dh_lintian:31
-#, fuzzy
-#| msgid "F<debian/source/lintian-overrides>"
-msgid "F<debian/source.lintian-overrides>"
+msgid "F<debian/source/lintian-overrides>"
 msgstr "F<debian/source/lintian-overrides>"
 
 #. type: textblock
@@ -7234,7 +7233,7 @@ msgstr ""
 "\t\n"
 
 #. type: textblock
-#: dh_shlibdeps:173
+#: dh_shlibdeps:177
 msgid "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 msgstr "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 

diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index 2956501a717a078bb4e2b5c785afc7f1e4df8141..3812b26d86357829661bbb1c79545a9348d39c63 100644 (file)
--- 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: 2012-05-18 11:05-0400\n"
+"POT-Creation-Date: 2012-08-13 17:34-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"
@@ -1180,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:674 dh:893 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:85 dh_auto_test:59 dh_bugfiles:122 dh_builddeb:124 dh_clean:142 dh_compress:206 dh_desktop:31 dh_fixperms:127 dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:258 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:256 dh_installlogcheck:78 dh_installlogrotate:50 dh_installman:261 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:228 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:242 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_undocumented:28 dh_usrlocal:114
+#: debhelper.pod:674 dh:903 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:85 dh_auto_test:59 dh_bugfiles:122 dh_builddeb:124 dh_clean:142 dh_compress:206 dh_desktop:31 dh_fixperms:127 dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:258 dh_installcatalogs:120 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:256 dh_installlogcheck:78 dh_installlogrotate:50 dh_installman:261 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:228 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:175 dh_strip:242 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
 msgstr ""
 
@@ -1205,12 +1205,12 @@ msgid "Debhelper web site."
 msgstr ""
 
 #. type: =head1
-#: debhelper.pod:688 dh:899 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:91 dh_auto_test:65 dh_bugfiles:130 dh_builddeb:130 dh_clean:148 dh_compress:212 dh_desktop:37 dh_fixperms:133 dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:264 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:84 dh_installlogrotate:56 dh_installman:267 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:234 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:248 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120
+#: debhelper.pod:688 dh:909 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:91 dh_auto_test:65 dh_bugfiles:130 dh_builddeb:130 dh_clean:148 dh_compress:212 dh_desktop:37 dh_fixperms:133 dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:264 dh_installcatalogs:126 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:84 dh_installlogrotate:56 dh_installman:267 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:234 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:181 dh_strip:248 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: debhelper.pod:690 dh:901 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:93 dh_auto_test:67 dh_builddeb:132 dh_clean:150 dh_compress:214 dh_fixperms:135 dh_gencontrol:90 dh_install:266 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:264 dh_installlogrotate:58 dh_installman:269 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:236 dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:179 dh_strip:250 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_undocumented:36
+#: debhelper.pod:690 dh:911 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:93 dh_auto_test:67 dh_builddeb:132 dh_clean:150 dh_compress:214 dh_fixperms:135 dh_gencontrol:90 dh_install:266 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:264 dh_installlogrotate:58 dh_installman:269 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:236 dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:183 dh_strip:250 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr ""
 
@@ -1728,12 +1728,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh:895 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:87 dh_auto_test:61 dh_builddeb:126 dh_clean:144 dh_compress:208 dh_fixperms:129 dh_gconf:101 dh_gencontrol:84 dh_install:260 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:258 dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 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:230 dh_listpackages:32 dh_makeshlibs:260 dh_md5sums:92 dh_movefiles:172 dh_perl:148 dh_prep:62 dh_python:282 dh_strip:244 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_undocumented:30 dh_usrlocal:116
+#: dh:905 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:87 dh_auto_test:61 dh_builddeb:126 dh_clean:144 dh_compress:208 dh_fixperms:129 dh_gconf:101 dh_gencontrol:84 dh_install:260 dh_installcatalogs:122 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:258 dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 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:230 dh_listpackages:32 dh_makeshlibs:260 dh_md5sums:92 dh_movefiles:172 dh_perl:148 dh_prep:62 dh_python:282 dh_strip:244 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_undocumented:30 dh_usrlocal:116
 msgid "L<debhelper(7)>"
 msgstr ""
 
 #. type: textblock
-#: dh:897 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:89 dh_auto_test:63 dh_bugfiles:128 dh_builddeb:128 dh_clean:146 dh_compress:210 dh_desktop:35 dh_fixperms:131 dh_gconf:103 dh_gencontrol:86 dh_icons:69 dh_install:262 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:260 dh_installlogrotate:54 dh_installman:265 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:232 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:246 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118
+#: dh:907 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:89 dh_auto_test:63 dh_bugfiles:128 dh_builddeb:128 dh_clean:146 dh_compress:210 dh_desktop:35 dh_fixperms:131 dh_gconf:103 dh_gencontrol:86 dh_icons:69 dh_install:262 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:260 dh_installlogrotate:54 dh_installman:265 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:232 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:179 dh_strip:246 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr ""
 
@@ -2808,12 +2808,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_installcatalogs:120
+#: dh_installcatalogs:124
 msgid "F</usr/share/doc/sgml-base-doc/>"
 msgstr ""
 
 #. type: textblock
-#: dh_installcatalogs:124
+#: dh_installcatalogs:128
 msgid "Adam Di Carlo <aph@debian.org>"
 msgstr ""
 
@@ -4744,7 +4744,7 @@ msgstr ""
 
 #. type: =item
 #: dh_lintian:31
-msgid "F<debian/source.lintian-overrides>"
+msgid "F<debian/source/lintian-overrides>"
 msgstr ""
 
 #. type: textblock
@@ -5492,7 +5492,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: dh_shlibdeps:173
+#: dh_shlibdeps:177
 msgid "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 msgstr ""
 

diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index ad46da365bf299d8bd7fae39f3602e6f22ffb293..97504b945cd9fc98387634d790bf685b021b7058 100644 (file)
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -1723,11 +1723,11 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:674 dh:893 dh_auto_build:47 dh_auto_clean:50
+#: debhelper.pod:674 dh:903 dh_auto_build:47 dh_auto_clean:50
 #: dh_auto_configure:52 dh_auto_install:85 dh_auto_test:59 dh_bugfiles:122
 #: dh_builddeb:124 dh_clean:142 dh_compress:206 dh_desktop:31 dh_fixperms:127
 #: dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:258
-#: dh_installcatalogs:116 dh_installchangelogs:171 dh_installcron:77
+#: dh_installcatalogs:120 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:256
@@ -1736,7 +1736,7 @@ msgstr ""
 #: dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:115
 #: dh_installwm:108 dh_installxfonts:87 dh_link:228 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_perl:146 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:175
 #: dh_strip:242 dh_suidregister:117 dh_testdir:44 dh_testroot:27
 #: dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
@@ -1768,11 +1768,11 @@ msgstr "Sitio web de Debhelper."
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:688 dh:899 dh_auto_build:53 dh_auto_clean:56
+#: debhelper.pod:688 dh:909 dh_auto_build:53 dh_auto_clean:56
 #: dh_auto_configure:58 dh_auto_install:91 dh_auto_test:65 dh_bugfiles:130
 #: dh_builddeb:130 dh_clean:148 dh_compress:212 dh_desktop:37 dh_fixperms:133
 #: dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:264
-#: dh_installcatalogs:122 dh_installchangelogs:177 dh_installcron:83
+#: dh_installcatalogs:126 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:84
@@ -1781,14 +1781,14 @@ msgstr "Sitio web de Debhelper."
 #: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93
 #: dh_link:234 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:248 dh_suidregister:123
+#: dh_scrollkeeper:34 dh_shlibdeps:181 dh_strip:248 dh_suidregister:123
 #: dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:690 dh:901 dh_auto_build:55 dh_auto_clean:58
+#: debhelper.pod:690 dh:911 dh_auto_build:55 dh_auto_clean:58
 #: dh_auto_configure:60 dh_auto_install:93 dh_auto_test:67 dh_builddeb:132
 #: dh_clean:150 dh_compress:214 dh_fixperms:135 dh_gencontrol:90
 #: dh_install:266 dh_installchangelogs:179 dh_installcron:85 dh_installdeb:152
@@ -1799,7 +1799,7 @@ msgstr "AUTOR"
 #: dh_installmime:103 dh_installmodules:132 dh_installpam:67 dh_installppp:73
 #: dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:236
 #: dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178
-#: dh_prep:68 dh_shlibdeps:179 dh_strip:250 dh_suidregister:125 dh_testdir:52
+#: dh_prep:68 dh_shlibdeps:183 dh_strip:250 dh_suidregister:125 dh_testdir:52
 #: dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -2513,10 +2513,10 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh:895 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
+#: dh:905 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
 #: dh_auto_install:87 dh_auto_test:61 dh_builddeb:126 dh_clean:144
 #: dh_compress:208 dh_fixperms:129 dh_gconf:101 dh_gencontrol:84
-#: dh_install:260 dh_installcatalogs:118 dh_installchangelogs:173
+#: dh_install:260 dh_installcatalogs:122 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:258
@@ -2532,7 +2532,7 @@ msgstr "L<debhelper(7)>"
 
 # type: textblock
 #. type: textblock
-#: dh:897 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
+#: dh:907 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
 #: dh_auto_install:89 dh_auto_test:63 dh_bugfiles:128 dh_builddeb:128
 #: dh_clean:146 dh_compress:210 dh_desktop:35 dh_fixperms:131 dh_gconf:103
 #: dh_gencontrol:86 dh_icons:69 dh_install:262 dh_installchangelogs:175
@@ -2544,7 +2544,7 @@ msgstr "L<debhelper(7)>"
 #: dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91
 #: dh_link:232 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:246 dh_suidregister:121
+#: dh_scrollkeeper:32 dh_shlibdeps:179 dh_strip:246 dh_suidregister:121
 #: dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr "Este programa es parte de debhelper."
@@ -4061,13 +4061,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_installcatalogs:120
+#: dh_installcatalogs:124
 msgid "F</usr/share/doc/sgml-base-doc/>"
 msgstr "F</usr/share/doc/sgml-base-doc/>"
 
 # type: textblock
 #. type: textblock
-#: dh_installcatalogs:124
+#: dh_installcatalogs:128
 msgid "Adam Di Carlo <aph@debian.org>"
 msgstr "Adam Di Carlo <aph@debian.org>"
 
@@ -6730,8 +6730,8 @@ msgstr ""
 
 #. type: =item
 #: dh_lintian:31
-msgid "F<debian/source.lintian-overrides>"
-msgstr "F<debian/source.lintian-overrides>"
+msgid "F<debian/source/lintian-overrides>"
+msgstr "F<debian/source/lintian-overrides>"
 
 #. type: textblock
 #: dh_lintian:33
@@ -7803,7 +7803,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_shlibdeps:173
+#: dh_shlibdeps:177
 msgid "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 msgstr "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 

diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index c1e34cb62328f1e4eb430da63910d7fe3dd27925..11b3fc874ad0f55e797ecd58b7fa8aae9924e439 100644 (file)
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -1723,11 +1723,11 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:674 dh:893 dh_auto_build:47 dh_auto_clean:50
+#: debhelper.pod:674 dh:903 dh_auto_build:47 dh_auto_clean:50
 #: dh_auto_configure:52 dh_auto_install:85 dh_auto_test:59 dh_bugfiles:122
 #: dh_builddeb:124 dh_clean:142 dh_compress:206 dh_desktop:31 dh_fixperms:127
 #: dh_gconf:99 dh_gencontrol:82 dh_icons:65 dh_install:258
-#: dh_installcatalogs:116 dh_installchangelogs:171 dh_installcron:77
+#: dh_installcatalogs:120 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:256
@@ -1736,7 +1736,7 @@ msgstr ""
 #: dh_installmodules:124 dh_installpam:59 dh_installppp:65 dh_installudev:115
 #: dh_installwm:108 dh_installxfonts:87 dh_link:228 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_perl:146 dh_prep:60 dh_python:280 dh_scrollkeeper:28 dh_shlibdeps:175
 #: dh_strip:242 dh_suidregister:117 dh_testdir:44 dh_testroot:27
 #: dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
@@ -1769,11 +1769,11 @@ msgstr "Le site internet de debhelper."
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:688 dh:899 dh_auto_build:53 dh_auto_clean:56
+#: debhelper.pod:688 dh:909 dh_auto_build:53 dh_auto_clean:56
 #: dh_auto_configure:58 dh_auto_install:91 dh_auto_test:65 dh_bugfiles:130
 #: dh_builddeb:130 dh_clean:148 dh_compress:212 dh_desktop:37 dh_fixperms:133
 #: dh_gconf:105 dh_gencontrol:88 dh_icons:71 dh_install:264
-#: dh_installcatalogs:122 dh_installchangelogs:177 dh_installcron:83
+#: dh_installcatalogs:126 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:84
@@ -1782,14 +1782,14 @@ msgstr "Le site internet de debhelper."
 #: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93
 #: dh_link:234 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:248 dh_suidregister:123
+#: dh_scrollkeeper:34 dh_shlibdeps:181 dh_strip:248 dh_suidregister:123
 #: dh_testdir:50 dh_testroot:33 dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:690 dh:901 dh_auto_build:55 dh_auto_clean:58
+#: debhelper.pod:690 dh:911 dh_auto_build:55 dh_auto_clean:58
 #: dh_auto_configure:60 dh_auto_install:93 dh_auto_test:67 dh_builddeb:132
 #: dh_clean:150 dh_compress:214 dh_fixperms:135 dh_gencontrol:90
 #: dh_install:266 dh_installchangelogs:179 dh_installcron:85 dh_installdeb:152
@@ -1800,7 +1800,7 @@ msgstr "AUTEUR"
 #: dh_installmime:103 dh_installmodules:132 dh_installpam:67 dh_installppp:73
 #: dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:236
 #: dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178
-#: dh_prep:68 dh_shlibdeps:179 dh_strip:250 dh_suidregister:125 dh_testdir:52
+#: dh_prep:68 dh_shlibdeps:183 dh_strip:250 dh_suidregister:125 dh_testdir:52
 #: dh_testroot:35 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -2562,10 +2562,10 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh:895 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
+#: dh:905 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
 #: dh_auto_install:87 dh_auto_test:61 dh_builddeb:126 dh_clean:144
 #: dh_compress:208 dh_fixperms:129 dh_gconf:101 dh_gencontrol:84
-#: dh_install:260 dh_installcatalogs:118 dh_installchangelogs:173
+#: dh_install:260 dh_installcatalogs:122 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:258
@@ -2581,7 +2581,7 @@ msgstr "L<debhelper(7)>"
 
 # type: textblock
 #. type: textblock
-#: dh:897 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
+#: dh:907 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
 #: dh_auto_install:89 dh_auto_test:63 dh_bugfiles:128 dh_builddeb:128
 #: dh_clean:146 dh_compress:210 dh_desktop:35 dh_fixperms:131 dh_gconf:103
 #: dh_gencontrol:86 dh_icons:69 dh_install:262 dh_installchangelogs:175
@@ -2593,7 +2593,7 @@ msgstr "L<debhelper(7)>"
 #: dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91
 #: dh_link:232 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:246 dh_suidregister:121
+#: dh_scrollkeeper:32 dh_shlibdeps:179 dh_strip:246 dh_suidregister:121
 #: dh_testdir:48 dh_testroot:31 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr "Ce programme fait partie de debhelper."
@@ -4179,13 +4179,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_installcatalogs:120
+#: dh_installcatalogs:124
 msgid "F</usr/share/doc/sgml-base-doc/>"
 msgstr "F</usr/share/doc/sgml-base-doc/>"
 
 # type: textblock
 #. type: textblock
-#: dh_installcatalogs:124
+#: dh_installcatalogs:128
 msgid "Adam Di Carlo <aph@debian.org>"
 msgstr "Adam Di Carlo <aph@debian.org>"
 
@@ -6945,8 +6945,8 @@ msgstr ""
 # type: =item
 #. type: =item
 #: dh_lintian:31
-msgid "F<debian/source.lintian-overrides>"
-msgstr "F<debian/source.lintian-overrides>"
+msgid "F<debian/source/lintian-overrides>"
+msgstr "F<debian/source/lintian-overrides>"
 
 # type: textblock
 #. type: textblock
@@ -8035,7 +8035,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_shlibdeps:173
+#: dh_shlibdeps:177
 msgid "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
 msgstr "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"