summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Debian/Debhelper/Dh_Getopt.pm66
-rw-r--r--debian/changelog16
-rwxr-xr-xdh11
-rwxr-xr-xdh_builddeb4
-rwxr-xr-xdh_clean4
-rwxr-xr-xdh_gencontrol4
-rwxr-xr-xdh_install6
-rwxr-xr-xdh_installemacsen4
-rwxr-xr-xdh_installinit10
-rwxr-xr-xdh_installman4
-rwxr-xr-xdh_makeshlibs6
-rwxr-xr-xdh_md5sums5
-rwxr-xr-xdh_shlibdeps9
-rwxr-xr-xdh_strip4
-rw-r--r--doc/PROGRAMMING29
-rw-r--r--doc/TODO8
-rw-r--r--man/po4a/po/debhelper.pot34
-rw-r--r--man/po4a/po/es.po108
-rw-r--r--man/po4a/po/fr.po108
19 files changed, 216 insertions, 224 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index a676eaa..3ed6f90 100644
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -64,11 +64,6 @@ sub AddIgnore { my($option,$file)=@_;
$dh{IGNORE}->{$file}=1;
}
-# Add an item to the with list.
-sub AddWith { my($option,$value)=@_;
- push @{$dh{WITH}},$value;
-}
-
# This collects non-options values.
sub NonOption {
push @{$dh{ARGV}}, @_;
@@ -81,6 +76,8 @@ sub parseopts {
my $ret=GetOptions(
"v" => \$dh{VERBOSE},
"verbose" => \$dh{VERBOSE},
+
+ "no-act" => \$dh{NO_ACT},
"i" => \&AddPackage,
"indep" => \&AddPackage,
@@ -90,99 +87,53 @@ sub parseopts {
"p=s" => \&AddPackage,
"package=s" => \&AddPackage,
+
+ "N=s" => \&ExcludePackage,
+ "no-package=s" => \&ExcludePackage,
"dbg-package=s" => \&AddDebugPackage,
"s" => \&AddPackage,
"same-arch" => \&AddPackage,
- "N=s" => \&ExcludePackage,
- "no-package=s" => \&ExcludePackage,
-
"n" => \$dh{NOSCRIPTS},
"noscripts" => \$dh{NOSCRIPTS},
"o" => \$dh{ONLYSCRIPTS},
"onlyscripts" => \$dh{ONLYSCRIPTS},
- "x" => \$dh{INCLUDE_CONFFILES}, # is -x for some unknown historical reason..
- "include-conffiles" => \$dh{INCLUDE_CONFFILES},
-
"X=s" => \&AddExclude,
"exclude=s" => \&AddExclude,
- "ignore=s" => \&AddIgnore,
-
"d" => \$dh{D_FLAG},
- "remove-d" => \$dh{D_FLAG},
- "dirs-only" => \$dh{D_FLAG},
-
- "r" => \$dh{R_FLAG},
- "no-restart-on-upgrade" => \$dh{R_FLAG},
- "no-start" => \$dh{NO_START},
- "R|restart-after-upgrade" => \$dh{RESTART_AFTER_UPGRADE},
"k" => \$dh{K_FLAG},
"keep" => \$dh{K_FLAG},
- "keep-debug" => \$dh{K_FLAG},
"P=s" => \$dh{TMPDIR},
"tmpdir=s" => \$dh{TMPDIR},
"u=s", => \$dh{U_PARAMS},
- "update-rcd-params=s", => \$dh{U_PARAMS},
- "dpkg-shlibdeps-params=s", => \$dh{U_PARAMS},
- "dpkg-gencontrol-params=s", => \$dh{U_PARAMS},
-
- "l=s", => \$dh{L_PARAMS},
-
- "m=s", => \$dh{M_PARAMS},
- "major=s" => \$dh{M_PARAMS},
"V:s", => \$dh{V_FLAG},
- "version-info:s" => \$dh{V_FLAG},
"A" => \$dh{PARAMS_ALL},
"all" => \$dh{PARAMS_ALL},
-
- "no-act" => \$dh{NO_ACT},
- "init-script=s" => \$dh{INIT_SCRIPT},
-
"sourcedir=s" => \$dh{SOURCEDIR},
"destdir=s" => \$dh{DESTDIR},
-
- "filename=s" => \$dh{FILENAME},
"priority=s" => \$dh{PRIORITY},
- "flavor=s" => \$dh{FLAVOR},
-
- "autodest" => \$dh{AUTODEST},
-
"h|help" => \&showhelp,
"mainpackage=s" => \$dh{MAINPACKAGE},
- "list-missing" => \$dh{LIST_MISSING},
-
- "fail-missing" => \$dh{FAIL_MISSING},
-
- "L|libpackage=s" => \$dh{LIBPACKAGE},
-
"name=s" => \$dh{NAME},
-
+
"error-handler=s" => \$dh{ERROR_HANDLER},
- "add-udeb=s" => \$dh{SHLIBS_UDEB},
-
- "language=s" => \$dh{LANGUAGE},
-
- "until=s" => \$dh{UNTIL},
- "after=s" => \$dh{AFTER},
- "before=s" => \$dh{BEFORE},
- "remaining" => \$dh{REMAINING},
- "with=s" => \&AddWith,
+ "ignore=s" => \&AddIgnore,
%options,
@@ -190,7 +141,8 @@ sub parseopts {
);
if (!$ret) {
- error("unknown option; aborting");
+ warning("warning: this unknown option will be a fatal error in a future debhelper release");
+ #error("unknown option; aborting");
}
# Check to see if -V was specified. If so, but no parameters were
diff --git a/debian/changelog b/debian/changelog
index 37695cb..7235aeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debhelper (7.0.18) UNRELEASED; urgency=low
+debhelper (7.1.0) UNRELEASED; urgency=low
* dh_installchangelogs: Fall back to looking for changelog files ending
with ".txt". Closes: #498460
@@ -8,6 +8,20 @@ debhelper (7.0.18) UNRELEASED; urgency=low
* Allow individual debhelper programs to define their own special options
by passing a hash to init(), which is later passed on the Getopt::Long.
Closes: #370823
+ * Move many command-specific options to only be accepted by the command
+ that uses them. Affected options are:
+ -x, -r, -R, -l, -L, -m,
+ --include-conffiles, --no-restart-on-upgrade, --no-start,
+ --restart-after-upgrade, --init-script, --filename, --flavor, --autodest,
+ --libpackage, --add-udeb, --dpkg-shlibdeps-params,
+ --dpkg-gencontrol-params, --update-rcd-params, --major, --remove-d,
+ --dirs-only, --keep-debug, --version-info, --list-missing, --fail-missing,
+ --language, --until, --after, --before, --remaining, --with
+ * If any third-party debhelper commands use any of the above options,
+ they will be broken, and need to be changed to pass options to init().
+ * To avoid breaking rules files that pass options to commands that do not
+ use them, debhelper will now only warn if it encounters an unknown
+ option. This will be converted back to an error later.
-- Joey Hess <joeyh@debian.org> Wed, 10 Sep 2008 13:58:00 -0400
diff --git a/dh b/dh
index 7c37d8d..3330882 100755
--- a/dh
+++ b/dh
@@ -221,7 +221,16 @@ those in the sequence are still run.
# Stash this away before init modifies it.
my @ARGV_orig=@ARGV;
-init();
+init(options => {
+ "until=s" => \$dh{UNTIL},
+ "after=s" => \$dh{AFTER},
+ "before=s" => \$dh{BEFORE},
+ "remaining" => \$dh{REMAINING},
+ "with=s" => sub {
+ my ($option,$value)=@_;
+ push @{$dh{WITH}},$value;
+ },
+});
inhibit_log();
# Definitions of sequences.
diff --git a/dh_builddeb b/dh_builddeb
index 8c3930f..1de8aae 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -43,7 +43,9 @@ package.
=cut
-init();
+init(options => {
+ "filename=s" => \$dh{FILENAME},
+});
# Set the default destination directory.
if (! defined $dh{DESTDIR}) {
diff --git a/dh_clean b/dh_clean
index 5fd7f93..47019fc 100755
--- a/dh_clean
+++ b/dh_clean
@@ -57,7 +57,9 @@ Delete these files too.
=cut
-init();
+init(options => {
+ "dirs-only" => \$dh{D_FLAG},
+});
inhibit_log();
if ($dh{K_FLAG}) {
diff --git a/dh_gencontrol b/dh_gencontrol
index 268ab3a..abecc1e 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -37,7 +37,9 @@ Pass "params" to L<dpkg-gencontrol(1)>.
=cut
-init();
+init(options => {
+ "dpkg-gencontrol-params=s", => \$dh{U_PARAMS},
+});
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
diff --git a/dh_install b/dh_install
index cb30d4d..df68d33 100755
--- a/dh_install
+++ b/dh_install
@@ -109,7 +109,11 @@ The files will be installed into the first package dh_install acts on.
=cut
-init();
+init(options => {
+ "autodest" => \$dh{AUTODEST},
+ "list-missing" => \$dh{LIST_MISSING},
+ "fail-missing" => \$dh{FAIL_MISSING},
+});
my @installed;
diff --git a/dh_installemacsen b/dh_installemacsen
index ca0feb6..d8fa657 100755
--- a/dh_installemacsen
+++ b/dh_installemacsen
@@ -59,7 +59,9 @@ instances of the same text to be added to maintainer scripts.
=cut
-init();
+init(options => {
+ "flavor=s" => \$dh{FLAVOR},
+});
if (! defined $dh{PRIORITY}) {
$dh{PRIORITY}=50;
diff --git a/dh_installinit b/dh_installinit
index 7dde363..2f32b46 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -115,7 +115,15 @@ instances of the same text to be added to maintainer scripts.
=cut
-init();
+init(options => {
+ "r" => \$dh{R_FLAG},
+ "no-restart-on-upgrade" => \$dh{R_FLAG},
+ "no-start" => \$dh{NO_START},
+ "R|restart-after-upgrade" => \$dh{RESTART_AFTER_UPGRADE},
+ "init-script=s" => \$dh{INIT_SCRIPT},
+ "update-rcd-params=s", => \$dh{U_PARAMS},
+ "remove-d" => \$dh{D_FLAG},
+});
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
diff --git a/dh_installman b/dh_installman
index f0ff224..a167cc3 100755
--- a/dh_installman
+++ b/dh_installman
@@ -85,7 +85,9 @@ interface. Use this program instead.
=cut
-init();
+init(options => {
+ "language=s" => \$dh{LANGUAGE},
+});
my @sofiles;
my @sodests;
diff --git a/dh_makeshlibs b/dh_makeshlibs
index 642393d..0eb96b0 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -104,7 +104,11 @@ Generates a shlibs file that looks something like:
=cut
-init();
+init(options => {
+ "m=s", => \$dh{M_PARAMS},
+ "major=s" => \$dh{M_PARAMS},
+ "version-info:s" => \$dh{V_FLAG},
+});
foreach my $package (@{$dh{DOPACKAGES}}) {
next if is_udeb($package);
diff --git a/dh_md5sums b/dh_md5sums
index a53603e..da00090 100755
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -43,7 +43,10 @@ being listed in the md5sums file.
=cut
-init();
+init(options => {
+ "x" => \$dh{INCLUDE_CONFFILES}, # is -x for some unknown historical reason..
+ "include-conffiles" => \$dh{INCLUDE_CONFFILES},
+});
foreach my $package (@{$dh{DOPACKAGES}}) {
next if is_udeb($package);
diff --git a/dh_shlibdeps b/dh_shlibdeps
index e859f04..320f250 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -82,10 +82,15 @@ libfoo, and is installed into /usr/lib/bar/, you can make libfoo-bin depend
on libbar1 as follows:
dh_shlibdeps -Llibbar1 -l/usr/lib/bar
-
+
=cut
-init();
+init(options => {
+ "L|libpackage=s" => \$dh{LIBPACKAGE},
+ "add-udeb=s" => \$dh{SHLIBS_UDEB},
+ "dpkg-shlibdeps-params=s", => \$dh{U_PARAMS},
+ "l=s", => \$dh{L_PARAMS},
+});
if ($dh{L_PARAMS}) {
my @paths=();
diff --git a/dh_strip b/dh_strip
index 2796f9a..2c667bb 100755
--- a/dh_strip
+++ b/dh_strip
@@ -77,7 +77,9 @@ Debian policy, version 3.0.1
=cut
-init();
+init(options => {
+ "keep-debug" => \$dh{K_FLAG},
+});
# This variable can be used to turn off stripping (see Policy).
if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /nostrip/) {
diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index 0d96457..3cea384 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -106,27 +106,19 @@ switch variable description
-X EXCLUDE exclude a something from processing (you
decide what this means for your program)
(This is an array)
- EXCLUDE_FIND same as DH_EXCLUDE, except all items are put
+-X EXCLUDE_FIND same as EXCLUDE, except all items are put
into a string in a way that they will make
find find them. (Use ! in front to negate
that, of course) Note that this should
only be used inside complex_doit(), not in
doit().
--x INCLUDE_CONFFILES
- include conffiles. It's -x for obscure
- historical reasons.
-d D_FLAG you decide what this means to your program
--r R_FLAG you decide what this means to your program
--k K_FLAG you decide what this means to your program
+-k K_FLAG used to turn on keeping of something
-P TMPDIR package build directory (implies only one
package is being acted on)
-u U_PARAMS will be set to a string, that is typically
parameters your program passes on to some
other program. (This is an array)
--m M_PARAMS will be set to a string, you decide what it
- means to your program
--l L_PARAMS will be set to a string, you decide what it
- means to your program
-V V_FLAG will be set to a string, you decide what it
means to your program
-V V_FLAG_SET will be 1 if -V was specified, even if no
@@ -136,23 +128,14 @@ switch variable description
those processed here), will apply to all
binary packages the program acts on, not just
the first
---init-script INIT_SCRIPT will be set to a string, which specifies an
- init script name (probably only
- dh_installinit will ever use this)
---sourcedir SOURCEDIR will be set to a string (probably only
- dh_movefiles will ever use this)
---destdir DESTDIR will be set to a string (probably only
- dh_builddeb will ever use this)
---filename FILENAME will be set to a string
---flavor FLAVOR will be set to a string (probably only
- dh_installemacsen will ever use this)
---number PRIORITY will be set to a number (deprecated)
+--sourcedir SOURCEDIR will be set to a string
+--destdir DESTDIR will be set to a string
--priority PRIORITY will be set to a number
+--mainpackage MAINPACKAGE controls which package is treated as the
+ main package to act on
--name NAME a name to use for installed files, instead of
the package name
--error-handler ERROR_HANDLER a function to call on error
---language LANGUAGE specify what language a file is in
---add-udeb SHLIBS_UDEB used by dh_makeshlibs
Any additional command line parameters that do not start with "-" will be
ignored, and you can access them later just as you normally would.
diff --git a/doc/TODO b/doc/TODO
index 0a7354f..d598db6 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -3,11 +3,6 @@ list grows - I welcome patches to fix items on it!
Wishlist items:
-* All debhelper programs should only accept the options they are documented
- to accept (rather than accepting all debhelper options). This is mostly a
- matter of moving command-specific options out of Dh_Getopt and into the
- individial command's calls to init(). (#112349)
-
v8:
* escaping in config files (for whitespace)?
@@ -34,3 +29,6 @@ Deprecated:
* dh_installinit --init-script
* dh_python
* dh_clean -k (make it warn)
+* Convert warning about unknown command-line options back to an error.
+ Need to wait a file (from Oct 2008) to ensure that most rules files
+ that pass unknown options to commands are fixed.
diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index 0c21484..8539b8f 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-07-09 16:16-0400\n"
+"POT-Creation-Date: 2008-10-21 14:44-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -897,7 +897,7 @@ msgid ""
msgstr ""
# type: =head1
-#: debhelper.pod:503 dh_builddeb:85 dh_clean:128 dh_compress:190 dh_desktop:47 dh_fixperms:110 dh_gconf:92 dh_gencontrol:73 dh_installcatalogs:109 dh_installchangelogs:140 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:216 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:29 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:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
+#: debhelper.pod:503 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47 dh_fixperms:110 dh_gconf:92 dh_gencontrol:83 dh_installcatalogs:109 dh_installchangelogs:140 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:111 dh_installexamples:103 dh_installinfo:103 dh_installinit:224 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:251 dh_installmenu:80 dh_installmime:85 dh_installmodules:116 dh_installpam:52 dh_install:272 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:226 dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:164 dh_strip:226 dh_suidregister:117 dh_testdir:44 dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
msgid "SEE ALSO"
msgstr ""
@@ -922,12 +922,12 @@ msgid "Debhelper web site."
msgstr ""
# type: =head1
-#: debhelper.pod:517 dh_builddeb:91 dh_clean:134 dh_compress:196 dh_desktop:53 dh_fixperms:116 dh_gconf:98 dh_gencontrol:79 dh_installcatalogs:115 dh_installchangelogs:146 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:222 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:35 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:50 dh_testroot:33 dh_testversion:81 dh_undocumented:34 dh_usrlocal:120
+#: debhelper.pod:517 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53 dh_fixperms:116 dh_gconf:98 dh_gencontrol:89 dh_installcatalogs:115 dh_installchangelogs:146 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 dh_installemacsen:117 dh_installexamples:109 dh_installinfo:109 dh_installinit:230 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:257 dh_installmenu:88 dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:278 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:35 dh_makeshlibs:232 dh_md5sums:95 dh_movefiles:168 dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:170 dh_strip:232 dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81 dh_undocumented:34 dh_usrlocal:120
msgid "AUTHOR"
msgstr ""
# type: textblock
-#: debhelper.pod:519 dh_builddeb:93 dh_clean:136 dh_compress:198 dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:148 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:224 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:37 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170 dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_testversion:83 dh_undocumented:36
+#: debhelper.pod:519 dh_builddeb:95 dh_clean:138 dh_compress:198 dh_fixperms:118 dh_gencontrol:91 dh_installchangelogs:148 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:245 dh_installemacsen:119 dh_installexamples:111 dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:259 dh_installmenu:90 dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:280 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:37 dh_makeshlibs:234 dh_md5sums:97 dh_movefiles:170 dh_shlibdeps:172 dh_strip:234 dh_suidregister:125 dh_testdir:52 dh_testroot:35 dh_testversion:83 dh_undocumented:36
msgid "Joey Hess <joeyh@debian.org>"
msgstr ""
@@ -995,12 +995,12 @@ 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:130 dh_compress:192 dh_fixperms:112 dh_gconf:94 dh_gencontrol:75 dh_installcatalogs:111 dh_installchangelogs:142 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:218 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:31 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164 dh_perl:154 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
+#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:94 dh_gencontrol:85 dh_installcatalogs:111 dh_installchangelogs:142 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:239 dh_installemacsen:113 dh_installexamples:105 dh_installinfo:105 dh_installinit:226 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:253 dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:274 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:31 dh_makeshlibs:228 dh_md5sums:91 dh_movefiles:164 dh_perl:154 dh_python:284 dh_strip:228 dh_suidregister:119 dh_testdir:46 dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
msgid "L<debhelper(7)>"
msgstr ""
# type: textblock
-#: dh_builddeb:89 dh_clean:132 dh_compress:194 dh_desktop:51 dh_fixperms:114 dh_gconf:96 dh_gencontrol:77 dh_installchangelogs:144 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:220 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:33 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:48 dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
+#: dh_builddeb:91 dh_clean:134 dh_compress:194 dh_desktop:51 dh_fixperms:114 dh_gconf:96 dh_gencontrol:87 dh_installchangelogs:144 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107 dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:255 dh_installmenu:86 dh_installmime:89 dh_installmodules:120 dh_installpam:56 dh_install:276 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:230 dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:168 dh_strip:230 dh_suidregister:121 dh_testdir:48 dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
msgid "This program is a part of debhelper."
msgstr ""
@@ -2803,12 +2803,12 @@ msgid ""
msgstr ""
# type: =head1
-#: dh_install:241
+#: dh_install:245
msgid "EXAMPLE"
msgstr ""
# type: textblock
-#: dh_install:243
+#: dh_install:247
msgid ""
"Suppose your package's upstream Makefile installs a binary, a man page, and "
"a library into appropriate subdirectories of debian/tmp. You want to put the "
@@ -2818,7 +2818,7 @@ msgid ""
msgstr ""
# type: verbatim
-#: dh_install:249
+#: dh_install:253
#, no-wrap
msgid ""
" usr/bin\n"
@@ -2827,12 +2827,12 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_install:252
+#: dh_install:256
msgid "While debian/libfoo.install contains:"
msgstr ""
# type: verbatim
-#: dh_install:254
+#: dh_install:258
#, no-wrap
msgid ""
" usr/lib/libfoo*.so.*\n"
@@ -2840,14 +2840,14 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_install:256
+#: dh_install:260
msgid ""
"If you want a libfoo-dev package too, debian/libfoo-dev.install might "
"contain:"
msgstr ""
# type: verbatim
-#: dh_install:258
+#: dh_install:262
#, no-wrap
msgid ""
" usr/include\n"
@@ -2857,12 +2857,12 @@ msgid ""
msgstr ""
# type: =head1
-#: dh_install:262
+#: dh_install:266
msgid "LIMITATIONS"
msgstr ""
# type: verbatim
-#: dh_install:264
+#: dh_install:268
#, no-wrap
msgid ""
"dh_install cannot rename files or directories, it can only install them\n"
@@ -3816,11 +3816,11 @@ msgstr ""
#, no-wrap
msgid ""
"\tdh_shlibdeps -Llibbar1 -l/usr/lib/bar\n"
-"\n"
+"\t\n"
msgstr ""
# type: textblock
-#: dh_shlibdeps:161
+#: dh_shlibdeps:166
msgid "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
msgstr ""
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index a1b86c8..8c7f507 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-07-09 16:16-0400\n"
+"POT-Creation-Date: 2008-10-21 14:44-0300\n"
"PO-Revision-Date: 2005-09-18 00:11+0200\n"
"Last-Translator: Rubén Porras Campo <debian-l10n-spanish@lists.debian.org>\n"
"Language-Team: SPANISH <debian-l10n-spanish@lists.debian.org>\n"
@@ -1175,17 +1175,17 @@ msgstr ""
"puntos, p. ej.: DH_ALWAYS_EXCLUDE=CVS:.svn"
# type: =head1
-#: debhelper.pod:503 dh_builddeb:85 dh_clean:128 dh_compress:190 dh_desktop:47
-#: dh_fixperms:110 dh_gconf:92 dh_gencontrol:73 dh_installcatalogs:109
+#: debhelper.pod:503 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47
+#: dh_fixperms:110 dh_gconf:92 dh_gencontrol:83 dh_installcatalogs:109
#: dh_installchangelogs:140 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:216
+#: dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:111
+#: dh_installexamples:103 dh_installinfo:103 dh_installinit:224
#: 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:29 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:44
+#: dh_installman:251 dh_installmenu:80 dh_installmime:85 dh_installmodules:116
+#: dh_installpam:52 dh_install:272 dh_installppp:56 dh_installwm:107
+#: dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:226
+#: dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76
+#: dh_shlibdeps:164 dh_strip:226 dh_suidregister:117 dh_testdir:44
#: dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
msgid "SEE ALSO"
msgstr "VÉASE ADEMÁS"
@@ -1211,33 +1211,33 @@ msgid "Debhelper web site."
msgstr "Web de Debhelper."
# type: =head1
-#: debhelper.pod:517 dh_builddeb:91 dh_clean:134 dh_compress:196 dh_desktop:53
-#: dh_fixperms:116 dh_gconf:98 dh_gencontrol:79 dh_installcatalogs:115
+#: debhelper.pod:517 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53
+#: dh_fixperms:116 dh_gconf:98 dh_gencontrol:89 dh_installcatalogs:115
#: dh_installchangelogs:146 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:222 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_installemacsen:117 dh_installexamples:109 dh_installinfo:109
+#: dh_installinit:230 dh_installlogcheck:57 dh_installlogrotate:56
+#: dh_installmanpages:203 dh_installman:257 dh_installmenu:88
+#: dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:278
#: dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229
-#: dh_listpackages:35 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_listpackages:35 dh_makeshlibs:232 dh_md5sums:95 dh_movefiles:168
+#: dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:170 dh_strip:232
#: dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81
#: dh_undocumented:34 dh_usrlocal:120
msgid "AUTHOR"
msgstr "AUTOR"
# type: textblock
-#: debhelper.pod:519 dh_builddeb:93 dh_clean:136 dh_compress:198
-#: dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:148 dh_installcron:69
+#: debhelper.pod:519 dh_builddeb:95 dh_clean:138 dh_compress:198
+#: dh_fixperms:118 dh_gencontrol:91 dh_installchangelogs:148 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:224 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_installdocs:245 dh_installemacsen:119 dh_installexamples:111
+#: dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58
+#: dh_installmanpages:205 dh_installman:259 dh_installmenu:90
+#: dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:280
#: dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231
-#: dh_listpackages:37 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170
-#: dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:52
+#: dh_listpackages:37 dh_makeshlibs:234 dh_md5sums:97 dh_movefiles:170
+#: dh_shlibdeps:172 dh_strip:234 dh_suidregister:125 dh_testdir:52
#: dh_testroot:35 dh_testversion:83 dh_undocumented:36
msgid "Joey Hess <joeyh@debian.org>"
msgstr "Joey Hess <joeyh@debian.org>"
@@ -1325,31 +1325,31 @@ msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
msgstr "Pasa I<parámetros> a L<dpkg-deb(1)> cuando se construye el paquete."
# type: textblock
-#: dh_builddeb:87 dh_clean:130 dh_compress:192 dh_fixperms:112 dh_gconf:94
-#: dh_gencontrol:75 dh_installcatalogs:111 dh_installchangelogs:142
+#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:94
+#: dh_gencontrol:85 dh_installcatalogs:111 dh_installchangelogs:142
#: 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:218 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_installdocs:239 dh_installemacsen:113 dh_installexamples:105
+#: dh_installinfo:105 dh_installinit:226 dh_installlogcheck:53
+#: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:253
+#: dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:274
#: dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225
-#: dh_listpackages:31 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164
-#: dh_perl:154 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:46
+#: dh_listpackages:31 dh_makeshlibs:228 dh_md5sums:91 dh_movefiles:164
+#: dh_perl:154 dh_python:284 dh_strip:228 dh_suidregister:119 dh_testdir:46
#: dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
msgid "L<debhelper(7)>"
msgstr "L<debhelper(7)>"
# type: textblock
-#: dh_builddeb:89 dh_clean:132 dh_compress:194 dh_desktop:51 dh_fixperms:114
-#: dh_gconf:96 dh_gencontrol:77 dh_installchangelogs:144 dh_installcron:65
+#: dh_builddeb:91 dh_clean:134 dh_compress:194 dh_desktop:51 dh_fixperms:114
+#: dh_gconf:96 dh_gencontrol:87 dh_installchangelogs:144 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:220 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:33 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:48
+#: dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107
+#: dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201
+#: dh_installman:255 dh_installmenu:86 dh_installmime:89 dh_installmodules:120
+#: dh_installpam:56 dh_install:276 dh_installppp:60 dh_installwm:111
+#: dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:230
+#: dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80
+#: dh_shlibdeps:168 dh_strip:230 dh_suidregister:121 dh_testdir:48
#: dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
msgid "This program is a part of debhelper."
msgstr "Este programa es parte de debhelper."
@@ -3734,12 +3734,12 @@ msgstr ""
"actúe dh_install."
# type: =head1
-#: dh_install:241
+#: dh_install:245
msgid "EXAMPLE"
msgstr "EJEMPLO"
# type: textblock
-#: dh_install:243
+#: dh_install:247
msgid ""
"Suppose your package's upstream Makefile installs a binary, a man page, and "
"a library into appropriate subdirectories of debian/tmp. You want to put the "
@@ -3754,7 +3754,7 @@ msgstr ""
"sourcedir=debian/tmp\". Haga un debian/tal.install que contenga:"
# type: verbatim
-#: dh_install:249
+#: dh_install:253
#, no-wrap
msgid ""
" usr/bin\n"
@@ -3766,12 +3766,12 @@ msgstr ""
"\n"
# type: textblock
-#: dh_install:252
+#: dh_install:256
msgid "While debian/libfoo.install contains:"
msgstr "Mientras que debian/libtal.install debe contener:"
# type: verbatim
-#: dh_install:254
+#: dh_install:258
#, no-wrap
msgid ""
" usr/lib/libfoo*.so.*\n"
@@ -3781,7 +3781,7 @@ msgstr ""
"\n"
# type: textblock
-#: dh_install:256
+#: dh_install:260
msgid ""
"If you want a libfoo-dev package too, debian/libfoo-dev.install might "
"contain:"
@@ -3790,7 +3790,7 @@ msgstr ""
"que contenga:"
# type: verbatim
-#: dh_install:258
+#: dh_install:262
#, no-wrap
msgid ""
" usr/include\n"
@@ -3804,12 +3804,12 @@ msgstr ""
"\n"
# type: =head1
-#: dh_install:262
+#: dh_install:266
msgid "LIMITATIONS"
msgstr "LIMITACIONES"
# type: verbatim
-#: dh_install:264
+#: dh_install:268
#, no-wrap
msgid ""
"dh_install cannot rename files or directories, it can only install them\n"
@@ -5056,14 +5056,14 @@ msgstr ""
#, fuzzy, no-wrap
msgid ""
"\tdh_shlibdeps -Llibbar1 -l/usr/lib/bar\n"
-"\n"
+"\t\n"
msgstr ""
"\tdh_makeshlibs\n"
"\tdh_shlibdeps -L libfoo1 -l debian/libfoo1/usr/lib\n"
"\n"
# type: textblock
-#: dh_shlibdeps:161
+#: dh_shlibdeps:166
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 6c37120..4f2b3ab 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2008-07-09 16:16-0400\n"
+"POT-Creation-Date: 2008-10-21 14:44-0300\n"
"PO-Revision-Date: 2006-11-19 20:50+0100\n"
"Last-Translator: Valery Perrin <valery.perrin.debian@free.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1205,17 +1205,17 @@ msgstr ""
"dans DH_ALWAYS_EXCLUDE=CVS:.svn"
# type: =head1
-#: debhelper.pod:503 dh_builddeb:85 dh_clean:128 dh_compress:190 dh_desktop:47
-#: dh_fixperms:110 dh_gconf:92 dh_gencontrol:73 dh_installcatalogs:109
+#: debhelper.pod:503 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47
+#: dh_fixperms:110 dh_gconf:92 dh_gencontrol:83 dh_installcatalogs:109
#: dh_installchangelogs:140 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:216
+#: dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:111
+#: dh_installexamples:103 dh_installinfo:103 dh_installinit:224
#: 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:29 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:44
+#: dh_installman:251 dh_installmenu:80 dh_installmime:85 dh_installmodules:116
+#: dh_installpam:52 dh_install:272 dh_installppp:56 dh_installwm:107
+#: dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:226
+#: dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76
+#: dh_shlibdeps:164 dh_strip:226 dh_suidregister:117 dh_testdir:44
#: dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
@@ -1242,33 +1242,33 @@ msgid "Debhelper web site."
msgstr "Le site internet de debhelper."
# type: =head1
-#: debhelper.pod:517 dh_builddeb:91 dh_clean:134 dh_compress:196 dh_desktop:53
-#: dh_fixperms:116 dh_gconf:98 dh_gencontrol:79 dh_installcatalogs:115
+#: debhelper.pod:517 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53
+#: dh_fixperms:116 dh_gconf:98 dh_gencontrol:89 dh_installcatalogs:115
#: dh_installchangelogs:146 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:222 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_installemacsen:117 dh_installexamples:109 dh_installinfo:109
+#: dh_installinit:230 dh_installlogcheck:57 dh_installlogrotate:56
+#: dh_installmanpages:203 dh_installman:257 dh_installmenu:88
+#: dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:278
#: dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229
-#: dh_listpackages:35 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_listpackages:35 dh_makeshlibs:232 dh_md5sums:95 dh_movefiles:168
+#: dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:170 dh_strip:232
#: dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81
#: dh_undocumented:34 dh_usrlocal:120
msgid "AUTHOR"
msgstr "AUTEUR"
# type: textblock
-#: debhelper.pod:519 dh_builddeb:93 dh_clean:136 dh_compress:198
-#: dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:148 dh_installcron:69
+#: debhelper.pod:519 dh_builddeb:95 dh_clean:138 dh_compress:198
+#: dh_fixperms:118 dh_gencontrol:91 dh_installchangelogs:148 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:224 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_installdocs:245 dh_installemacsen:119 dh_installexamples:111
+#: dh_installinfo:111 dh_installinit:232 dh_installlogrotate:58
+#: dh_installmanpages:205 dh_installman:259 dh_installmenu:90
+#: dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:280
#: dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231
-#: dh_listpackages:37 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170
-#: dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:52
+#: dh_listpackages:37 dh_makeshlibs:234 dh_md5sums:97 dh_movefiles:170
+#: dh_shlibdeps:172 dh_strip:234 dh_suidregister:125 dh_testdir:52
#: dh_testroot:35 dh_testversion:83 dh_undocumented:36
msgid "Joey Hess <joeyh@debian.org>"
msgstr "Joey Hess <joeyh@debian.org>"
@@ -1357,31 +1357,31 @@ msgstr ""
"Fournit les I<paramètres> à L<dpkg-deb(1)> lors de la construction du paquet."
# type: textblock
-#: dh_builddeb:87 dh_clean:130 dh_compress:192 dh_fixperms:112 dh_gconf:94
-#: dh_gencontrol:75 dh_installcatalogs:111 dh_installchangelogs:142
+#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:112 dh_gconf:94
+#: dh_gencontrol:85 dh_installcatalogs:111 dh_installchangelogs:142
#: 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:218 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_installdocs:239 dh_installemacsen:113 dh_installexamples:105
+#: dh_installinfo:105 dh_installinit:226 dh_installlogcheck:53
+#: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:253
+#: dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:274
#: dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225
-#: dh_listpackages:31 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164
-#: dh_perl:154 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:46
+#: dh_listpackages:31 dh_makeshlibs:228 dh_md5sums:91 dh_movefiles:164
+#: dh_perl:154 dh_python:284 dh_strip:228 dh_suidregister:119 dh_testdir:46
#: dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
msgid "L<debhelper(7)>"
msgstr "L<debhelper(7)>"
# type: textblock
-#: dh_builddeb:89 dh_clean:132 dh_compress:194 dh_desktop:51 dh_fixperms:114
-#: dh_gconf:96 dh_gencontrol:77 dh_installchangelogs:144 dh_installcron:65
+#: dh_builddeb:91 dh_clean:134 dh_compress:194 dh_desktop:51 dh_fixperms:114
+#: dh_gconf:96 dh_gencontrol:87 dh_installchangelogs:144 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:220 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:33 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:48
+#: dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107
+#: dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201
+#: dh_installman:255 dh_installmenu:86 dh_installmime:89 dh_installmodules:120
+#: dh_installpam:56 dh_install:276 dh_installppp:60 dh_installwm:111
+#: dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:230
+#: dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80
+#: dh_shlibdeps:168 dh_strip:230 dh_suidregister:121 dh_testdir:48
#: dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
msgid "This program is a part of debhelper."
msgstr "Ce programme fait partie de debhelper."
@@ -3827,12 +3827,12 @@ msgstr ""
"paquet traité par dh_install."
# type: =head1
-#: dh_install:241
+#: dh_install:245
msgid "EXAMPLE"
msgstr "EXEMPLE"
# type: textblock
-#: dh_install:243
+#: dh_install:247
msgid ""
"Suppose your package's upstream Makefile installs a binary, a man page, and "
"a library into appropriate subdirectories of debian/tmp. You want to put the "
@@ -3848,7 +3848,7 @@ msgstr ""
"debian/toto.install qui S<contienne :>"
# type: verbatim
-#: dh_install:249
+#: dh_install:253
#, no-wrap
msgid ""
" usr/bin\n"
@@ -3860,12 +3860,12 @@ msgstr ""
"\n"
# type: textblock
-#: dh_install:252
+#: dh_install:256
msgid "While debian/libfoo.install contains:"
msgstr "Tandis que debian/libtoto.install devra S<contenir :>"
# type: verbatim
-#: dh_install:254
+#: dh_install:258
#, no-wrap
msgid ""
" usr/lib/libfoo*.so.*\n"
@@ -3875,7 +3875,7 @@ msgstr ""
"\n"
# type: textblock
-#: dh_install:256
+#: dh_install:260
msgid ""
"If you want a libfoo-dev package too, debian/libfoo-dev.install might "
"contain:"
@@ -3884,7 +3884,7 @@ msgstr ""
"dev.install devra S<contenir :>"
# type: verbatim
-#: dh_install:258
+#: dh_install:262
#, no-wrap
msgid ""
" usr/include\n"
@@ -3898,12 +3898,12 @@ msgstr ""
"\n"
# type: =head1
-#: dh_install:262
+#: dh_install:266
msgid "LIMITATIONS"
msgstr "LIMITES"
# type: verbatim
-#: dh_install:264
+#: dh_install:268
#, no-wrap
msgid ""
"dh_install cannot rename files or directories, it can only install them\n"
@@ -5168,14 +5168,14 @@ msgstr ""
#, fuzzy, no-wrap
msgid ""
"\tdh_shlibdeps -Llibbar1 -l/usr/lib/bar\n"
-"\n"
+"\t\n"
msgstr ""
"\tdh_makeshlibs\n"
"\tdh_shlibdeps -L libtoto1 -l debian/libtoto1/usr/lib\n"
"\n"
# type: textblock
-#: dh_shlibdeps:161
+#: dh_shlibdeps:166
msgid "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"
msgstr "L<debhelper(7)>, L<dpkg-shlibdeps(1)>"