summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Debian/Debhelper/Dh_Getopt.pm210
-rw-r--r--Debian/Debhelper/Dh_Lib.pm36
-rw-r--r--autoscripts/postinst-gconf-defaults2
-rw-r--r--autoscripts/postrm-gconf-defaults2
-rw-r--r--debhelper.pod17
-rw-r--r--debian/changelog66
-rw-r--r--debian/control3
-rwxr-xr-xdh11
-rwxr-xr-xdh_builddeb4
-rwxr-xr-xdh_clean4
-rwxr-xr-xdh_gconf20
-rwxr-xr-xdh_gencontrol17
-rwxr-xr-xdh_install28
-rwxr-xr-xdh_installchangelogs2
-rwxr-xr-xdh_installemacsen4
-rwxr-xr-xdh_installinit10
-rwxr-xr-xdh_installman4
-rwxr-xr-xdh_makeshlibs6
-rwxr-xr-xdh_md5sums5
-rwxr-xr-xdh_prep2
-rwxr-xr-xdh_shlibdeps9
-rwxr-xr-xdh_strip4
-rw-r--r--doc/PROGRAMMING38
-rw-r--r--doc/TODO30
-rw-r--r--man/po4a/po/debhelper.pot130
-rw-r--r--man/po4a/po/es.po217
-rw-r--r--man/po4a/po/fr.po219
-rwxr-xr-xt/syntax2
28 files changed, 615 insertions, 487 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 3221a96..afad4b3 100644
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -9,12 +9,8 @@ use strict;
use Debian::Debhelper::Dh_Lib;
use Getopt::Long;
-use Exporter;
-#use vars qw{@ISA @EXPORT};
-#@ISA=qw(Exporter);
-#@EXPORT=qw(&aparseopts); # FIXME: for some reason, this doesn't work.
-my (%options, %exclude_package);
+my %exclude_package;
sub showhelp {
my $prog=basename($0);
@@ -29,19 +25,19 @@ sub showhelp {
# order.
sub AddPackage { my($option,$value)=@_;
if ($option eq 'i' or $option eq 'indep') {
- push @{$options{DOPACKAGES}}, getpackages('indep');
- $options{DOINDEP}=1;
+ push @{$dh{DOPACKAGES}}, getpackages('indep');
+ $dh{DOINDEP}=1;
}
elsif ($option eq 'a' or $option eq 'arch') {
- push @{$options{DOPACKAGES}}, getpackages('arch');
- $options{DOARCH}=1;
+ push @{$dh{DOPACKAGES}}, getpackages('arch');
+ $dh{DOARCH}=1;
}
elsif ($option eq 'p' or $option eq 'package') {
- push @{$options{DOPACKAGES}}, $value;
+ push @{$dh{DOPACKAGES}}, $value;
}
elsif ($option eq 's' or $option eq 'same-arch') {
- push @{$options{DOPACKAGES}}, getpackages('same');
- $options{DOSAME}=1;
+ push @{$dh{DOPACKAGES}}, getpackages('same');
+ $dh{DOSAME}=1;
}
else {
error("bad option $option - should never happen!\n");
@@ -50,7 +46,7 @@ sub AddPackage { my($option,$value)=@_;
# Adds packages to the list of debug packages.
sub AddDebugPackage { my($option,$value)=@_;
- push @{$options{DEBUGPACKAGES}}, $value;
+ push @{$dh{DEBUGPACKAGES}}, $value;
}
# Add a package to a list of packages that should not be acted on.
@@ -60,39 +56,28 @@ sub ExcludePackage { my($option,$value)=@_;
# Add another item to the exclude list.
sub AddExclude { my($option,$value)=@_;
- push @{$options{EXCLUDE}},$value;
+ push @{$dh{EXCLUDE}},$value;
}
# Add a file to the ignore list.
sub AddIgnore { my($option,$file)=@_;
- $options{IGNORE}->{$file}=1;
-}
-
-# Add an item to the with list.
-sub AddWith { my($option,$value)=@_;
- push @{$options{WITH}},$value;
+ $dh{IGNORE}->{$file}=1;
}
# This collects non-options values.
sub NonOption {
- push @{$options{ARGV}}, @_;
+ push @{$dh{ARGV}}, @_;
}
-# Parse options and return a hash of the values.
-sub parseopts {
- undef %options;
+sub getoptions {
+ my $array=shift;
+ my %options=%{shift()} if ref $_[0];
- # DH_INTERNAL_OPTIONS is used to pass additional options from
- # dh through an override target to a command.
- if (defined $ENV{DH_INTERNAL_OPTIONS}) {
- $ENV{DH_INTERNAL_OPTIONS}=~s/^\s+//;
- $ENV{DH_INTERNAL_OPTIONS}=~s/\s+$//;
- unshift @ARGV, split(/\s+/,$ENV{DH_INTERNAL_OPTIONS});
- }
-
- my $ret=GetOptions(
- "v" => \$options{VERBOSE},
- "verbose" => \$options{VERBOSE},
+ Getopt::Long::GetOptionsFromArray($array,
+ "v" => \$dh{VERBOSE},
+ "verbose" => \$dh{VERBOSE},
+
+ "no-act" => \$dh{NO_ACT},
"i" => \&AddPackage,
"indep" => \&AddPackage,
@@ -102,124 +87,109 @@ 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" => \$options{NOSCRIPTS},
- "noscripts" => \$options{NOSCRIPTS},
- "o" => \$options{ONLYSCRIPTS},
- "onlyscripts" => \$options{ONLYSCRIPTS},
+ "n" => \$dh{NOSCRIPTS},
+ "noscripts" => \$dh{NOSCRIPTS},
+ "o" => \$dh{ONLYSCRIPTS},
+ "onlyscripts" => \$dh{ONLYSCRIPTS},
- "x" => \$options{INCLUDE_CONFFILES}, # is -x for some unknown historical reason..
- "include-conffiles" => \$options{INCLUDE_CONFFILES},
-
"X=s" => \&AddExclude,
"exclude=s" => \&AddExclude,
- "ignore=s" => \&AddIgnore,
-
- "d" => \$options{D_FLAG},
- "remove-d" => \$options{D_FLAG},
- "dirs-only" => \$options{D_FLAG},
-
- "r" => \$options{R_FLAG},
- "no-restart-on-upgrade" => \$options{R_FLAG},
- "no-start" => \$options{NO_START},
- "R|restart-after-upgrade" => \$options{RESTART_AFTER_UPGRADE},
+ "d" => \$dh{D_FLAG},
- "k" => \$options{K_FLAG},
- "keep" => \$options{K_FLAG},
- "keep-debug" => \$options{K_FLAG},
-
- "P=s" => \$options{TMPDIR},
- "tmpdir=s" => \$options{TMPDIR},
-
- "u=s", => \$options{U_PARAMS},
- "update-rcd-params=s", => \$options{U_PARAMS},
- "dpkg-shlibdeps-params=s", => \$options{U_PARAMS},
- "dpkg-gencontrol-params=s", => \$options{U_PARAMS},
-
- "l=s", => \$options{L_PARAMS},
+ "k" => \$dh{K_FLAG},
+ "keep" => \$dh{K_FLAG},
- "m=s", => \$options{M_PARAMS},
- "major=s" => \$options{M_PARAMS},
+ "P=s" => \$dh{TMPDIR},
+ "tmpdir=s" => \$dh{TMPDIR},
- "V:s", => \$options{V_FLAG},
- "version-info:s" => \$options{V_FLAG},
+ "u=s", => \$dh{U_PARAMS},
- "A" => \$options{PARAMS_ALL},
- "all" => \$options{PARAMS_ALL},
+ "V:s", => \$dh{V_FLAG},
- "no-act" => \$options{NO_ACT},
+ "A" => \$dh{PARAMS_ALL},
+ "all" => \$dh{PARAMS_ALL},
- "init-script=s" => \$options{INIT_SCRIPT},
+ "sourcedir=s" => \$dh{SOURCEDIR},
- "sourcedir=s" => \$options{SOURCEDIR},
+ "destdir=s" => \$dh{DESTDIR},
- "destdir=s" => \$options{DESTDIR},
-
- "filename=s" => \$options{FILENAME},
-
- "priority=s" => \$options{PRIORITY},
+ "priority=s" => \$dh{PRIORITY},
- "flavor=s" => \$options{FLAVOR},
-
- "autodest" => \$options{AUTODEST},
-
"h|help" => \&showhelp,
- "mainpackage=s" => \$options{MAINPACKAGE},
+ "mainpackage=s" => \$dh{MAINPACKAGE},
- "list-missing" => \$options{LIST_MISSING},
+ "name=s" => \$dh{NAME},
- "fail-missing" => \$options{FAIL_MISSING},
-
- "L|libpackage=s" => \$options{LIBPACKAGE},
-
- "name=s" => \$options{NAME},
+ "error-handler=s" => \$dh{ERROR_HANDLER},
- "error-handler=s" => \$options{ERROR_HANDLER},
-
- "add-udeb=s" => \$options{SHLIBS_UDEB},
-
- "language=s" => \$options{LANGUAGE},
+ "ignore=s" => \&AddIgnore,
- "until=s" => \$options{UNTIL},
- "after=s" => \$options{AFTER},
- "before=s" => \$options{BEFORE},
- "remaining" => \$options{REMAINING},
- "with=s" => \&AddWith,
+ %options,
"<>" => \&NonOption,
- );
+ )
+}
+
+# Parse options and set %dh values.
+sub parseopts {
+ my $options=shift;
+ # DH_OPTIONS can contain additional options
+ # to be parsed like @ARGV, but with unknown options
+ # skipped.
+ my @ARGV_extra;
+ if (defined $ENV{DH_OPTIONS}) {
+ $ENV{DH_OPTIONS}=~s/^\s+//;
+ $ENV{DH_OPTIONS}=~s/\s+$//;
+ @ARGV_extra=split(/\s+/,$ENV{DH_OPTIONS});
+ my $ret=getoptions(\@ARGV_extra, $options);
+ if (!$ret) {
+ warning("warning: ignored unknown options in DH_OPTIONS");
+ }
+ }
+
+ # DH_INTERNAL_OPTIONS is used to pass additional options from
+ # dh through an override target to a command.
+ if (defined $ENV{DH_INTERNAL_OPTIONS}) {
+ $ENV{DH_INTERNAL_OPTIONS}=~s/^\s+//;
+ $ENV{DH_INTERNAL_OPTIONS}=~s/\s+$//;
+ unshift @ARGV, split(/\s+/,$ENV{DH_INTERNAL_OPTIONS});
+ }
+
+ my $ret=getoptions(\@ARGV, $options);
if (!$ret) {
- error("unknown option; aborting");
+ warning("warning: unknown options 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
# passed, the variable will be defined but empty.
- if (defined($options{V_FLAG})) {
- $options{V_FLAG_SET}=1;
+ if (defined($dh{V_FLAG})) {
+ $dh{V_FLAG_SET}=1;
}
# If we have not been given any packages to act on, assume they
# want us to act on them all. Note we have to do this before excluding
# packages out, below.
- if (! defined $options{DOPACKAGES} || ! @{$options{DOPACKAGES}}) {
- if ($options{DOINDEP} || $options{DOARCH} || $options{DOSAME}) {
+ if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
+ if ($dh{DOINDEP} || $dh{DOARCH} || $dh{DOSAME}) {
# User specified that all arch (in)dep package be
# built, and there are none of that type.
warning("I have no package to build");
exit(0);
}
- push @{$options{DOPACKAGES}},getpackages();
+ push @{$dh{DOPACKAGES}},getpackages();
}
# Remove excluded packages from the list of packages to act on.
@@ -228,7 +198,7 @@ sub parseopts {
my @package_list;
my $package;
my %packages_seen;
- foreach $package (@{$options{DOPACKAGES}}) {
+ foreach $package (@{$dh{DOPACKAGES}}) {
if (! $exclude_package{$package}) {
if (! exists $packages_seen{$package}) {
$packages_seen{$package}=1;
@@ -236,27 +206,25 @@ sub parseopts {
}
}
}
- @{$options{DOPACKAGES}}=@package_list;
+ @{$dh{DOPACKAGES}}=@package_list;
# If there are no packages to act on now, it's an error.
- if (! defined $options{DOPACKAGES} || ! @{$options{DOPACKAGES}}) {
+ if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
error("I have no package to build");
}
- if (defined $options{U_PARAMS}) {
+ if (defined $dh{U_PARAMS}) {
# Split the U_PARAMS up into an array.
- my $u=$options{U_PARAMS};
- undef $options{U_PARAMS};
- push @{$options{U_PARAMS}}, split(/\s+/,$u);
+ my $u=$dh{U_PARAMS};
+ undef $dh{U_PARAMS};
+ push @{$dh{U_PARAMS}}, split(/\s+/,$u);
}
# Anything left in @ARGV is options that appeared after a --
# These options are added to the U_PARAMS array, while the
# non-option values we collected replace them in @ARGV;
- push @{$options{U_PARAMS}}, @ARGV;
- @ARGV=@{$options{ARGV}} if exists $options{ARGV};
-
- return %options;
+ push @{$dh{U_PARAMS}}, @ARGV, @ARGV_extra;
+ @ARGV=@{$dh{ARGV}} if exists $dh{ARGV};
}
sub import {
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 871adf4..a11c36a 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -20,23 +20,18 @@ use vars qw(@ISA @EXPORT %dh);
my $max_compat=7;
sub init {
- # If DH_OPTIONS is set, prepend it @ARGV.
- if (defined($ENV{DH_OPTIONS})) {
- # Ignore leading/trailing whitespace.
- $ENV{DH_OPTIONS}=~s/^\s+//;
- $ENV{DH_OPTIONS}=~s/\s+$//;
- unshift @ARGV,split(/\s+/,$ENV{DH_OPTIONS});
- }
+ my %params=@_;
- # Check to see if an argument on the command line starts with a dash.
- # if so, we need to pass this off to the resource intensive
+ # Check to see if an option line starts with a dash,
+ # or DH_OPTIONS is set.
+ # If so, we need to pass this off to the resource intensive
# Getopt::Long, which I'd prefer to avoid loading at all if possible.
if ((defined $ENV{DH_OPTIONS} && length $ENV{DH_OPTIONS}) ||
(defined $ENV{DH_INTERNAL_OPTIONS} && length $ENV{DH_INTERNAL_OPTIONS}) ||
grep /^-/, @ARGV) {
eval "use Debian::Debhelper::Dh_Getopt";
- error($!) if $@;
- %dh=Debian::Debhelper::Dh_Getopt::parseopts();
+ error($@) if $@;
+ Debian::Debhelper::Dh_Getopt::parseopts($params{options});
}
# Another way to set excludes.
@@ -167,8 +162,7 @@ sub doit {
verbose_print(escape_shell(@_));
if (! $dh{NO_ACT}) {
- my $ret=system(@_);
- $ret == 0 || error("command returned error code $ret");
+ system(@_) == 0 || _error_exitcode($_[0]);
}
}
@@ -181,11 +175,23 @@ sub complex_doit {
if (! $dh{NO_ACT}) {
# The join makes system get a scalar so it forks off a shell.
- system(join(" ",@_)) == 0
- || error("command returned error code");
+ system(join(" ", @_)) == 0 || _error_exitcode(join(" ", @_))
}
}
+sub _error_exitcode {
+ my $command=shift;
+ if ($? == -1) {
+ error("$command failed to to execute: $!");
+ }
+ elsif ($? & 127) {
+ error("$command died with signal ".($? & 127));
+ }
+ else {
+ error("$command returned exit code ".($? >> 8));
+ }
+}
+
# Run a command that may have a huge number of arguments, like xargs does.
# Pass in a reference to an array containing the arguments, and then other
# parameters that are the command and any parameters that should be passed to
diff --git a/autoscripts/postinst-gconf-defaults b/autoscripts/postinst-gconf-defaults
index 1d84aa4..eff244a 100644
--- a/autoscripts/postinst-gconf-defaults
+++ b/autoscripts/postinst-gconf-defaults
@@ -1,3 +1,3 @@
if [ "$1" = "configure" ] && which update-gconf-defaults >/dev/null 2>&1; then
- update-gconf-defaults
+ update-gconf-defaults #OPT#
fi
diff --git a/autoscripts/postrm-gconf-defaults b/autoscripts/postrm-gconf-defaults
index 4684498..b15de67 100644
--- a/autoscripts/postrm-gconf-defaults
+++ b/autoscripts/postrm-gconf-defaults
@@ -1,3 +1,3 @@
if which update-gconf-defaults >/dev/null 2>&1; then
- update-gconf-defaults
+ update-gconf-defaults #OPT#
fi
diff --git a/debhelper.pod b/debhelper.pod
index e840d31..de2a053 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -366,8 +366,8 @@ Changes from V5 are:
=item -
-Commands that generate maintainer script fragements will order the
-fragements in reverse order for the prerm and postrm scripts.
+Commands that generate maintainer script fragments will order the
+fragments in reverse order for the prerm and postrm scripts.
=item -
@@ -400,7 +400,7 @@ Changes from V6 are:
dh_install, will fall back to looking for files in debian/tmp if it doesn't
find them in the current directory (or wherever you tell it look using
---srcdir). This allows dh_install to interoperate with dh_auto_install,
+--sourcedir). This allows dh_install to interoperate with dh_auto_install,
which installs to debian/tmp, without needing any special parameters.
=item -
@@ -477,10 +477,13 @@ Set to 1 to enable no-act mode.
=item DH_OPTIONS
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 you need to pass -p to all debhelper commands that will be run. One good
-way to set DH_OPTIONS is by using "Target-specific Variable Values" in your
-debian/rules file. See the make documentation for details on doing this.
+of all debhelper commands. Command-specific options will be ignored by
+commands that do not support them.
+
+This is useful in some situations, for example, if you need to pass -p to
+all debhelper commands that will be run. One good way to set DH_OPTIONS is
+by using "Target-specific Variable Values" in your debian/rules file. See
+the make documentation for details on doing this.
=item DH_ALWAYS_EXCLUDE
diff --git a/debian/changelog b/debian/changelog
index 2f7f73c..b1199fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,67 @@
+debhelper (7.2.1) experimental; urgency=low
+
+ * Merged debhelper 7.0.52.
+
+ -- Joey Hess <joeyh@debian.org> Sat, 28 Feb 2009 20:01:22 -0500
+
+debhelper (7.2.0) experimental; urgency=low
+
+ * Merged debhelper 7.0.50.
+ * dh: Fix typo. Closes: #509754
+ * debhelper.pod: Fix typo. Closes: #510180
+ * dh_gconf: Support mandatory settings. Closes: #513923
+ * Improve error messages when child commands fail.
+ * Depend on dpkg-dev 1.14.19, the first to support Package-Type
+ fields in dpkg-gencontrol.
+ * dh_gencontrol: No longer need to generate the udeb filename
+ when calling dpkg-gencontrol.
+ * dh_gencontrol: Do not need to tell dpkg-gencontol not to
+ include the Homepage field in udebs (fixed in dpkg-dev 1.14.17).
+
+ -- Joey Hess <joeyh@debian.org> Thu, 26 Feb 2009 18:33:44 -0500
+
+debhelper (7.1.1) experimental; urgency=low
+
+ * dh_install(1): Order options alphabetically. Closes:# 503896
+ * Fix some docs that refered to --srcdir rather than --sourcedir.
+ Closes: #504742
+ * Add Vcs-Browser field. Closes: #507804
+ * Ignore unknown options in DH_OPTIONS. Debhelper will always ignore
+ such options, even when unknown command-line options are converted back
+ to an error. This allows (ab)using DH_OPTIONS to pass command-specific
+ options.
+ (Note that getopt will warn about such unknown options. Eliminating this
+ warning without reimplementing much of Getopt::Long wasn't practical.)
+
+ -- Joey Hess <joeyh@debian.org> Sun, 14 Dec 2008 23:19:27 -0500
+
+debhelper (7.1.0) experimental; urgency=low
+
+ * dh_installchangelogs: Fall back to looking for changelog files ending
+ with ".txt". Closes: #498460
+ * dh_gencontrol: Ensure misc:Depends is set in substvars to avoid dpkg
+ complaining about it when it's empty. Closes: #498666
+ * dh: Fix typo in example. Closes: #500836
+ * 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
+
debhelper (7.0.52) unstable; urgency=low
* dh: Fix make parsing to not be broken by locale settings.
@@ -27,7 +91,7 @@ debhelper (7.0.50) unstable; urgency=low
* dh: Support debian/rules calling make with -B,
which is useful to avoid issues with phony implicit
rules (see bug #509756).
-
+
-- Joey Hess <joeyh@debian.org> Fri, 27 Feb 2009 15:25:52 -0500
debhelper (7.0.17) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e82372b..1b30157 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,12 @@ Maintainer: Joey Hess <joeyh@debian.org>
Build-Depends: po4a (>= 0.24), man-db (>= 2.5.1), file (>= 3.23)
Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/debhelper/debhelper.git
+Vcs-Browser: http://git.debian.org/?p=debhelper/debhelper.git;a=summary
Homepage: http://kitenet.net/~joey/code/debhelper/
Package: debhelper
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg-dev (>= 1.14.15), html2text, binutils, po-debconf, man-db (>= 2.5.1-1)
+Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg-dev (>= 1.14.19), html2text, binutils, po-debconf, man-db (>= 2.5.1-1)
Suggests: dh-make
Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6)
Description: helper programs for debian/rules
diff --git a/dh b/dh
index 6c52f72..7cba156 100755
--- a/dh
+++ b/dh
@@ -194,7 +194,16 @@ default. This is how to use dh_pycentral instead.
# 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_gconf b/dh_gconf
index 84a6a6c..8c30de7 100755
--- a/dh_gconf
+++ b/dh_gconf
@@ -27,6 +27,11 @@ installed into usr/share/gconf/defaults/10_package in the package build
directory, with "package" replaced by the package name. Some postinst and
postrm fragments will be generated to launch update-gconf-defaults.
+If a file named debian/package.gconf-mandatory exists, then it is
+installed into usr/share/gconf/mandatory/10_package in the package build
+directory, with "package" replaced by the package name, and similar
+postinst and postrm fragments will be generated.
+
The gconf-schemas and update-gconf-defaults scripts are provided by the
gconf2 package. An appropriate dependency will be generated in
${misc:Depends}.
@@ -57,13 +62,22 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
my $gconf_dep = 0;
+ my $mandatory = pkgfile($package, "gconf-mandatory");
+ if ($mandatory ne '') {
+ doit("mkdir","-p","$tmp/usr/share/gconf/mandatory");
+ doit("install","-p","-m644",$mandatory,"$tmp/usr/share/gconf/mandatory/${priority}_$package");
+ autoscript($package,"postinst","postinst-gconf-defaults","s%#OPT#%--mandatory%");
+ autoscript($package,"postrm","postrm-gconf-defaults","s%#OPT#%--mandatory%");
+ addsubstvar($package, "misc:Depends", "gconf2 (>= 2.24.0-5)");
+ $gconf_dep = 1;
+ }
my $defaults = pkgfile($package,"gconf-defaults");
if ($defaults ne '') {
doit("mkdir","-p","$tmp/usr/share/gconf/defaults");
doit("install","-p","-m644",$defaults,"$tmp/usr/share/gconf/defaults/${priority}_$package");
- autoscript($package,"postinst","postinst-gconf-defaults");
- autoscript($package,"postrm","postrm-gconf-defaults");
- addsubstvar($package, "misc:Depends", "gconf2 (>= 2.12.1-1)");
+ autoscript($package,"postinst","postinst-gconf-defaults","s%#OPT#%%");
+ autoscript($package,"postrm","postrm-gconf-defaults","s%#OPT#%%");
+ addsubstvar($package, "misc:Depends", "gconf2 (>= 2.12.1-1)") unless $gconf_dep;
$gconf_dep = 1;
}
diff --git a/dh_gencontrol b/dh_gencontrol
index 785586f..726d085 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -37,11 +37,15 @@ 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);
my $ext=pkgext($package);
+
+ my $substvars="debian/${ext}substvars";
my $changelog=pkgfile($package,'changelog');
if (! $changelog) {
@@ -52,16 +56,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
}
+ # avoid gratuitous warning
+ if (! -e $substvars || system("grep -q '^misc:Depends=' $substvars") != 0) {
+ complex_doit("echo misc:Depends= >> $substvars");
+ }
+
# Generate and install control file.
my @command="dpkg-gencontrol";
if (getpackages() > 1) {
push @command, "-p$package";
}
- if (is_udeb($package)) {
- push @command, "-UHomepage";
- push @command, "-n".udeb_filename($package);
- }
- doit(@command, "-l$changelog", "-Tdebian/${ext}substvars",
+ doit(@command, "-l$changelog", "-T$substvars",
"-P$tmp",@{$dh{U_PARAMS}});
# This chmod is only necessary if the user sets the umask to
diff --git a/dh_install b/dh_install
index cb30d4d..1483d27 100755
--- a/dh_install
+++ b/dh_install
@@ -42,17 +42,12 @@ directories and files from there into the proper package build directories.
From debhelper compatibility level 7 on, dh_install will fall back to
looking in debian/tmp for files, if it doesn't find them in the current
-directory (or whereever you've told it to look using --srcdir).
+directory (or whereever you've told it to look using --sourcedir).
=head1 OPTIONS
=over 4
-=item B<-Xitem>, B<--exclude=item>
-
-Exclude files that contain "item" anywhere in their filename from
-being installed.
-
=item B<--autodest>
Guess as the destination directory to install things to. If this is
@@ -71,6 +66,11 @@ itself in a
debian/package.install file, with no explicit destination, then dh_install
will automatically guess the destination even if this flag is not set.
+=item B<--fail-missing>
+
+This option is like --list-missing, except if a file was missed, it will
+not only list the missing files, but also fail with a nonzero exit code.
+
=item B<--list-missing>
This option makes dh_install keep track of the files it installs, and then at
@@ -84,11 +84,6 @@ you don't miss installing newly added files in new upstream releases.
Note that files that are excluded from being moved via the -X option are not
warned about.
-=item B<--fail-missing>
-
-This option is like --list-missing, except if a file was missed, it will
-not only list the missing files, but also fail with a nonzero exit code.
-
=item B<--sourcedir=dir>
Makes all source files be found under dir. If this is specified, it is
@@ -100,6 +95,11 @@ package.files file to package.install and call dh_install with
approximate dh_movefiles behaviour, except it will copy files instead
of moving them.
+=item B<-Xitem>, B<--exclude=item>
+
+Exclude files that contain "item" anywhere in their filename from
+being installed.
+
=item I<file [...] dest>
Lists files (or directories) to install and where to install them to.
@@ -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_installchangelogs b/dh_installchangelogs
index 7042c5f..a5cce3f 100755
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -68,7 +68,7 @@ my $changelog_name="changelog.Debian";
if (! defined $upstream) {
if (! isnative($dh{MAINPACKAGE}) && !compat(6)) {
my @files=sort glob("*");
- foreach my $name (qw{changelog changes}) {
+ foreach my $name (qw{changelog changes changelog.txt changes.txt}) {
my @matches=grep { lc $_ eq $name && -s $_ } @files;
if (@matches) {
$upstream=shift @matches;
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_prep b/dh_prep
index 690ab54..d9e4bf8 100755
--- a/dh_prep
+++ b/dh_prep
@@ -2,7 +2,7 @@
=head1 NAME
-dh_prep - preform cleanups in preparation for building a binary package
+dh_prep - perform cleanups in preparation for building a binary package
=cut
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 bd6645e..3cea384 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -77,6 +77,13 @@ All debhelper programs should respond to certain arguments, such as -v, -i,
-a, and -p. To help you make this work right, Dh_Lib.pm handles argument
processing. Just call init().
+You can add support for additional options to your command by passing an
+options hash to init(). The hash is then passed on the Getopt::Long to
+parse the command line options. For example, to add a --foo option, which
+sets $dh{FOO}:
+
+init(options => { foo => \$dh{FOO} });
+
After argument processing, some global variables are used to hold the
results; programs can use them later. These variables are elements of the
%dh hash.
@@ -99,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
@@ -129,29 +128,18 @@ 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.
-If you need a new command line option, just ask me, and I will add it.
-
Global variables:
----------------
diff --git a/doc/TODO b/doc/TODO
index 18cdb90..71fda9f 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -3,33 +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). They should
- be able to print brief usage summaries.
-
- I think this calls for a restructuring. Make a Debhelper.pm class. Each
- program subclasses the class. The class provides command line parsing,
- useful functions, and so on. Skeleton of a debhelper command would then
- be:
-
- use base qw{Debhelper};
-
- sub startup {
- # Add initialization stuff here.
- }
-
- sub perpackage {
- my $package=shift;
-
- # Stuff to do for each package here.
- }
-
- sub fini {
- # And final stuff here, if any.
- }
-
- This needs more thought.
-
v8:
* escaping in config files (for whitespace)?
@@ -56,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 while (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..b066563 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: 2009-02-27 15:37-0500\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"
@@ -676,8 +676,8 @@ msgstr ""
# type: textblock
#: debhelper.pod:369
msgid ""
-"Commands that generate maintainer script fragements will order the "
-"fragements in reverse order for the prerm and postrm scripts."
+"Commands that generate maintainer script fragments will order the fragments "
+"in reverse order for the prerm and postrm scripts."
msgstr ""
# type: textblock
@@ -722,7 +722,7 @@ msgstr ""
msgid ""
"dh_install, will fall back to looking for files in debian/tmp if it doesn't "
"find them in the current directory (or wherever you tell it look using "
-"--srcdir). This allows dh_install to interoperate with dh_auto_install, "
+"--sourcedir). This allows dh_install to interoperate with dh_auto_install, "
"which installs to debian/tmp, without needing any special parameters."
msgstr ""
@@ -859,19 +859,26 @@ msgstr ""
#: 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 "
-"you need to pass -p to all debhelper commands that will be run. One good way "
-"to set DH_OPTIONS is by using \"Target-specific Variable Values\" in your "
-"debian/rules file. See the make documentation for details on doing this."
+"all debhelper commands. Command-specific options will be ignored by commands "
+"that do not support them."
+msgstr ""
+
+# type: textblock
+#: debhelper.pod:483
+msgid ""
+"This is useful in some situations, for example, if you need to pass -p to "
+"all debhelper commands that will be run. One good way to set DH_OPTIONS is "
+"by using \"Target-specific Variable Values\" in your debian/rules file. See "
+"the make documentation for details on doing this."
msgstr ""
# type: =item
-#: debhelper.pod:485
+#: debhelper.pod:488
msgid "DH_ALWAYS_EXCLUDE"
msgstr ""
# type: textblock
-#: debhelper.pod:487
+#: debhelper.pod:490
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 "
@@ -879,7 +886,7 @@ msgid ""
msgstr ""
# type: textblock
-#: debhelper.pod:491
+#: debhelper.pod:494
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 "
@@ -890,44 +897,44 @@ msgid ""
msgstr ""
# type: textblock
-#: debhelper.pod:498
+#: debhelper.pod:501
msgid ""
"Multiple things to exclude can be separated with colons, as in "
"DH_ALWAYS_EXCLUDE=CVS:.svn"
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:506 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47 dh_fixperms:110 dh_gconf:106 dh_gencontrol:79 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 ""
# type: =item
-#: debhelper.pod:507
+#: debhelper.pod:510
msgid "F</usr/share/doc/debhelper/examples/>"
msgstr ""
# type: textblock
-#: debhelper.pod:509
+#: debhelper.pod:512
msgid "A set of example debian/rules files that use debhelper."
msgstr ""
# type: =item
-#: debhelper.pod:511
+#: debhelper.pod:514
msgid "L<http://kitenet.net/~joey/code/debhelper/>"
msgstr ""
# type: textblock
-#: debhelper.pod:513
+#: debhelper.pod:516
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:520 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53 dh_fixperms:116 dh_gconf:112 dh_gencontrol:85 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:522 dh_builddeb:95 dh_clean:138 dh_compress:198 dh_fixperms:118 dh_gencontrol:87 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 ""
@@ -951,7 +958,7 @@ msgid ""
msgstr ""
# type: =head1
-#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:34 dh_gencontrol:26 dh_installcatalogs:42 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
+#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_installcatalogs:42 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 ""
@@ -995,12 +1002,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:108 dh_gencontrol:81 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:110 dh_gencontrol:83 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 ""
@@ -1290,18 +1297,27 @@ msgstr ""
# type: textblock
#: dh_gconf:30
msgid ""
+"If a file named debian/package.gconf-mandatory exists, then it is installed "
+"into usr/share/gconf/mandatory/10_package in the package build directory, "
+"with \"package\" replaced by the package name, and similar postinst and "
+"postrm fragments will be generated."
+msgstr ""
+
+# type: textblock
+#: dh_gconf:35
+msgid ""
"The gconf-schemas and update-gconf-defaults scripts are provided by the "
"gconf2 package. An appropriate dependency will be generated in "
"${misc:Depends}."
msgstr ""
# type: =item
-#: dh_gconf:38
+#: dh_gconf:43
msgid "B<--priority> I<priority>"
msgstr ""
# type: textblock
-#: dh_gconf:40
+#: dh_gconf:45
msgid ""
"Use I<priority> (which should be a 2-digit number) as the defaults priority "
"instead of 10. Higher values than ten can be used by derived distributions "
@@ -1309,7 +1325,7 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_gconf:100
+#: dh_gconf:114
msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
msgstr ""
@@ -1807,7 +1823,7 @@ msgid "Do not modify postinst/prerm scripts."
msgstr ""
# type: =item
-#: dh_installdocs:64 dh_installexamples:43 dh_install:51 dh_link:57 dh_movefiles:44
+#: dh_installdocs:64 dh_installexamples:43 dh_install:98 dh_link:57 dh_movefiles:44
msgid "B<-Xitem>, B<--exclude=item>"
msgstr ""
@@ -1966,7 +1982,7 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_installexamples:45 dh_install:53 dh_movefiles:46
+#: dh_installexamples:45 dh_install:100 dh_movefiles:46
msgid ""
"Exclude files that contain \"item\" anywhere in their filename from being "
"installed."
@@ -2693,16 +2709,16 @@ msgstr ""
msgid ""
"From debhelper compatibility level 7 on, dh_install will fall back to "
"looking in debian/tmp for files, if it doesn't find them in the current "
-"directory (or whereever you've told it to look using --srcdir)."
+"directory (or whereever you've told it to look using --sourcedir)."
msgstr ""
# type: =item
-#: dh_install:56
+#: dh_install:51
msgid "B<--autodest>"
msgstr ""
# type: textblock
-#: dh_install:58
+#: dh_install:53
msgid ""
"Guess as the destination directory to install things to. If this is "
"specified, you should not list destination directories in "
@@ -2711,7 +2727,7 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_install:63
+#: dh_install:58
msgid ""
"Strip off debian/tmp (or the sourcedir if one is given) from the front of "
"the filename, if it is present, and install into the dirname of the "
@@ -2721,7 +2737,7 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_install:69
+#: dh_install:64
msgid ""
"Note that if you list exactly one filename or wildcard-pattern on a line by "
"itself in a debian/package.install file, with no explicit destination, then "
@@ -2730,6 +2746,18 @@ msgid ""
msgstr ""
# type: =item
+#: dh_install:69
+msgid "B<--fail-missing>"
+msgstr ""
+
+# type: textblock
+#: dh_install:71
+msgid ""
+"This option is like --list-missing, except if a file was missed, it will not "
+"only list the missing files, but also fail with a nonzero exit code."
+msgstr ""
+
+# type: =item
#: dh_install:74
msgid "B<--list-missing>"
msgstr ""
@@ -2759,30 +2787,18 @@ msgstr ""
# type: =item
#: dh_install:87
-msgid "B<--fail-missing>"
-msgstr ""
-
-# type: textblock
-#: dh_install:89
-msgid ""
-"This option is like --list-missing, except if a file was missed, it will not "
-"only list the missing files, but also fail with a nonzero exit code."
-msgstr ""
-
-# type: =item
-#: dh_install:92
msgid "B<--sourcedir=dir>"
msgstr ""
# type: textblock
-#: dh_install:94
+#: dh_install:89
msgid ""
"Makes all source files be found under dir. If this is specified, it is akin "
"to all the source filenames having \"dir/\" prepended to them."
msgstr ""
# type: textblock
-#: dh_install:97
+#: dh_install:92
msgid ""
"To make dh_install behave like the old dh_movefiles, move your package.files "
"file to package.install and call dh_install with \"--sourcedir=debian/tmp\" "
@@ -2803,12 +2819,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 +2834,7 @@ msgid ""
msgstr ""
# type: verbatim
-#: dh_install:249
+#: dh_install:253
#, no-wrap
msgid ""
" usr/bin\n"
@@ -2827,12 +2843,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 +2856,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 +2873,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 +3832,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..07a0f35 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: 2009-02-27 15:37-0500\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"
@@ -901,8 +901,8 @@ msgstr ""
# type: textblock
#: debhelper.pod:369
msgid ""
-"Commands that generate maintainer script fragements will order the "
-"fragements in reverse order for the prerm and postrm scripts."
+"Commands that generate maintainer script fragments will order the fragments "
+"in reverse order for the prerm and postrm scripts."
msgstr ""
# type: textblock
@@ -950,8 +950,8 @@ msgstr ""
msgid ""
"dh_install, will fall back to looking for files in debian/tmp if it doesn't "
"find them in the current directory (or wherever you tell it look using --"
-"srcdir). This allows dh_install to interoperate with dh_auto_install, which "
-"installs to debian/tmp, without needing any special parameters."
+"sourcedir). This allows dh_install to interoperate with dh_auto_install, "
+"which installs to debian/tmp, without needing any special parameters."
msgstr ""
# type: textblock
@@ -1120,10 +1120,18 @@ msgstr "DH_OPTIONS"
#: 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 "
-"you need to pass -p to all debhelper commands that will be run. One good way "
-"to set DH_OPTIONS is by using \"Target-specific Variable Values\" in your "
-"debian/rules file. See the make documentation for details on doing this."
+"all debhelper commands. Command-specific options will be ignored by commands "
+"that do not support them."
+msgstr ""
+
+# type: textblock
+#: debhelper.pod:483
+#, fuzzy
+msgid ""
+"This is useful in some situations, for example, if you need to pass -p to "
+"all debhelper commands that will be run. One good way to set DH_OPTIONS is "
+"by using \"Target-specific Variable Values\" in your debian/rules file. See "
+"the make documentation for details on doing this."
msgstr ""
"Todo lo que halla en esta variable se antepondrá a los argumentos en la "
"línea de órdenes de todas las órdenes de debhelper. Esto es útil en algunas "
@@ -1133,12 +1141,12 @@ msgstr ""
"Lea la documentación de make para los detalles sobre como hacer esto."
# type: =item
-#: debhelper.pod:485
+#: debhelper.pod:488
msgid "DH_ALWAYS_EXCLUDE"
msgstr "DH_ALWAYS_EXCLUDE"
# type: textblock
-#: debhelper.pod:487
+#: debhelper.pod:490
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 "
@@ -1149,7 +1157,7 @@ msgstr ""
"coincida con el valor en el árbol de construcción."
# type: textblock
-#: debhelper.pod:491
+#: debhelper.pod:494
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 "
@@ -1166,7 +1174,7 @@ msgstr ""
"sitio donde se construya el paquete."
# type: textblock
-#: debhelper.pod:498
+#: debhelper.pod:501
msgid ""
"Multiple things to exclude can be separated with colons, as in "
"DH_ALWAYS_EXCLUDE=CVS:.svn"
@@ -1175,69 +1183,69 @@ 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:506 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47
+#: dh_fixperms:110 dh_gconf:106 dh_gencontrol:79 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"
# type: =item
-#: debhelper.pod:507
+#: debhelper.pod:510
msgid "F</usr/share/doc/debhelper/examples/>"
msgstr "F</usr/share/doc/debhelper/examples/>"
# type: textblock
-#: debhelper.pod:509
+#: debhelper.pod:512
msgid "A set of example debian/rules files that use debhelper."
msgstr "Varios ficheros de ejemplo debian/rules que usan debhelper."
# type: =item
-#: debhelper.pod:511
+#: debhelper.pod:514
msgid "L<http://kitenet.net/~joey/code/debhelper/>"
msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
# type: textblock
-#: debhelper.pod:513
+#: debhelper.pod:516
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:520 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53
+#: dh_fixperms:116 dh_gconf:112 dh_gencontrol:85 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:522 dh_builddeb:95 dh_clean:138 dh_compress:198
+#: dh_fixperms:118 dh_gencontrol:87 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>"
@@ -1267,7 +1275,7 @@ msgstr ""
"paquetes Debian."
# type: =head1
-#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:34
+#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:39
#: dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44
#: dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51
#: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37
@@ -1325,31 +1333,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:108
+#: dh_gencontrol:81 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:110 dh_gencontrol:83 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."
@@ -1716,6 +1724,19 @@ msgstr ""
# type: textblock
#: dh_gconf:30
+#, fuzzy
+msgid ""
+"If a file named debian/package.gconf-mandatory exists, then it is installed "
+"into usr/share/gconf/mandatory/10_package in the package build directory, "
+"with \"package\" replaced by the package name, and similar postinst and "
+"postrm fragments will be generated."
+msgstr ""
+"Si existe un fichero llamado debian/paquete.default, se instala en etc/"
+"default/paquete en el directorio de construcción del paquete, con \"paquete"
+"\" reemplazado por el nombre del paquete."
+
+# type: textblock
+#: dh_gconf:35
msgid ""
"The gconf-schemas and update-gconf-defaults scripts are provided by the "
"gconf2 package. An appropriate dependency will be generated in ${misc:"
@@ -1723,13 +1744,13 @@ msgid ""
msgstr ""
# type: =item
-#: dh_gconf:38
+#: dh_gconf:43
#, fuzzy
msgid "B<--priority> I<priority>"
msgstr "B<--priority=>I<n>"
# type: textblock
-#: dh_gconf:40
+#: dh_gconf:45
msgid ""
"Use I<priority> (which should be a 2-digit number) as the defaults priority "
"instead of 10. Higher values than ten can be used by derived distributions "
@@ -1737,7 +1758,7 @@ msgid ""
msgstr ""
# type: textblock
-#: dh_gconf:100
+#: dh_gconf:114
#, fuzzy
msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
msgstr "Josselin Mouette <joss@debian.org>"
@@ -2414,7 +2435,7 @@ msgid "Do not modify postinst/prerm scripts."
msgstr "No modifica los scripts de postinst/prerm."
# type: =item
-#: dh_installdocs:64 dh_installexamples:43 dh_install:51 dh_link:57
+#: dh_installdocs:64 dh_installexamples:43 dh_install:98 dh_link:57
#: dh_movefiles:44
msgid "B<-Xitem>, B<--exclude=item>"
msgstr "B<-Xelemento>, B<--exclude=elemento>"
@@ -2627,7 +2648,7 @@ msgstr ""
"actúe. (O en todos si se especifica B<-A>)."
# type: textblock
-#: dh_installexamples:45 dh_install:53 dh_movefiles:46
+#: dh_installexamples:45 dh_install:100 dh_movefiles:46
msgid ""
"Exclude files that contain \"item\" anywhere in their filename from being "
"installed."
@@ -3588,16 +3609,16 @@ msgstr ""
msgid ""
"From debhelper compatibility level 7 on, dh_install will fall back to "
"looking in debian/tmp for files, if it doesn't find them in the current "
-"directory (or whereever you've told it to look using --srcdir)."
+"directory (or whereever you've told it to look using --sourcedir)."
msgstr ""
# type: =item
-#: dh_install:56
+#: dh_install:51
msgid "B<--autodest>"
msgstr "B<--autodest>"
# type: textblock
-#: dh_install:58
+#: dh_install:53
msgid ""
"Guess as the destination directory to install things to. If this is "
"specified, you should not list destination directories in debian/package."
@@ -3610,7 +3631,7 @@ msgstr ""
"siguiente modo:"
# type: textblock
-#: dh_install:63
+#: dh_install:58
msgid ""
"Strip off debian/tmp (or the sourcedir if one is given) from the front of "
"the filename, if it is present, and install into the dirname of the "
@@ -3626,7 +3647,7 @@ msgstr ""
"etc/."
# type: textblock
-#: dh_install:69
+#: dh_install:64
msgid ""
"Note that if you list exactly one filename or wildcard-pattern on a line by "
"itself in a debian/package.install file, with no explicit destination, then "
@@ -3639,6 +3660,21 @@ msgstr ""
"ha usado esta opción."
# type: =item
+#: dh_install:69
+msgid "B<--fail-missing>"
+msgstr "B<--fail-missing>"
+
+# type: textblock
+#: dh_install:71
+msgid ""
+"This option is like --list-missing, except if a file was missed, it will not "
+"only list the missing files, but also fail with a nonzero exit code."
+msgstr ""
+"Esta opción es como --list-missing, excepto que si se olvida un fichero, no "
+"sólo se listarán los ficheros olvidados, sino que además se devolverá un "
+"código de salida distinto de cero."
+
+# type: =item
#: dh_install:74
msgid "B<--list-missing>"
msgstr "B<--list-missing>"
@@ -3678,26 +3714,11 @@ msgstr ""
# type: =item
#: dh_install:87
-msgid "B<--fail-missing>"
-msgstr "B<--fail-missing>"
-
-# type: textblock
-#: dh_install:89
-msgid ""
-"This option is like --list-missing, except if a file was missed, it will not "
-"only list the missing files, but also fail with a nonzero exit code."
-msgstr ""
-"Esta opción es como --list-missing, excepto que si se olvida un fichero, no "
-"sólo se listarán los ficheros olvidados, sino que además se devolverá un "
-"código de salida distinto de cero."
-
-# type: =item
-#: dh_install:92
msgid "B<--sourcedir=dir>"
msgstr "B<--sourcedir=dir>"
# type: textblock
-#: dh_install:94
+#: dh_install:89
msgid ""
"Makes all source files be found under dir. If this is specified, it is akin "
"to all the source filenames having \"dir/\" prepended to them."
@@ -3706,7 +3727,7 @@ msgstr ""
"es parecido a anteponer \"dir/\" a todos los nombres de los ficheros fuente."
# type: textblock
-#: dh_install:97
+#: dh_install:92
msgid ""
"To make dh_install behave like the old dh_movefiles, move your package.files "
"file to package.install and call dh_install with \"--sourcedir=debian/tmp\" "
@@ -3734,12 +3755,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 +3775,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 +3787,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 +3802,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 +3811,7 @@ msgstr ""
"que contenga:"
# type: verbatim
-#: dh_install:258
+#: dh_install:262
#, no-wrap
msgid ""
" usr/include\n"
@@ -3804,12 +3825,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 +5077,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..ebbf03a 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: 2009-02-27 15:37-0500\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"
@@ -923,8 +923,8 @@ msgstr "Les changements par rapport à la version 3 S<sont :>"
# type: textblock
#: debhelper.pod:369
msgid ""
-"Commands that generate maintainer script fragements will order the "
-"fragements in reverse order for the prerm and postrm scripts."
+"Commands that generate maintainer script fragments will order the fragments "
+"in reverse order for the prerm and postrm scripts."
msgstr ""
# type: textblock
@@ -974,8 +974,8 @@ msgstr "Les changements par rapport à la version 3 S<sont :>"
msgid ""
"dh_install, will fall back to looking for files in debian/tmp if it doesn't "
"find them in the current directory (or wherever you tell it look using --"
-"srcdir). This allows dh_install to interoperate with dh_auto_install, which "
-"installs to debian/tmp, without needing any special parameters."
+"sourcedir). This allows dh_install to interoperate with dh_auto_install, "
+"which installs to debian/tmp, without needing any special parameters."
msgstr ""
# type: textblock
@@ -1147,10 +1147,18 @@ msgstr "DH_OPTIONS"
#: 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 "
-"you need to pass -p to all debhelper commands that will be run. One good way "
-"to set DH_OPTIONS is by using \"Target-specific Variable Values\" in your "
-"debian/rules file. See the make documentation for details on doing this."
+"all debhelper commands. Command-specific options will be ignored by commands "
+"that do not support them."
+msgstr ""
+
+# type: textblock
+#: debhelper.pod:483
+#, fuzzy
+msgid ""
+"This is useful in some situations, for example, if you need to pass -p to "
+"all debhelper commands that will be run. One good way to set DH_OPTIONS is "
+"by using \"Target-specific Variable Values\" in your debian/rules file. See "
+"the make documentation for details on doing this."
msgstr ""
"Le contenu de cette variable sera ajouté au début des arguments de chaque "
"ligne de commande de debhelper. Ce comportement est utile dans quelques "
@@ -1161,12 +1169,12 @@ msgstr ""
"cette méthode."
# type: =item
-#: debhelper.pod:485
+#: debhelper.pod:488
msgid "DH_ALWAYS_EXCLUDE"
msgstr "DH_ALWAYS_EXCLUDE"
# type: textblock
-#: debhelper.pod:487
+#: debhelper.pod:490
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 "
@@ -1178,7 +1186,7 @@ msgstr ""
"construction de paquet."
# type: textblock
-#: debhelper.pod:491
+#: debhelper.pod:494
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 "
@@ -1196,7 +1204,7 @@ msgstr ""
"soit l'endroit où le paquet est construit."
# type: textblock
-#: debhelper.pod:498
+#: debhelper.pod:501
msgid ""
"Multiple things to exclude can be separated with colons, as in "
"DH_ALWAYS_EXCLUDE=CVS:.svn"
@@ -1205,70 +1213,70 @@ 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:506 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:47
+#: dh_fixperms:110 dh_gconf:106 dh_gencontrol:79 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"
# type: =item
-#: debhelper.pod:507
+#: debhelper.pod:510
msgid "F</usr/share/doc/debhelper/examples/>"
msgstr "F</usr/share/doc/debhelper/examples/>"
# type: textblock
-#: debhelper.pod:509
+#: debhelper.pod:512
msgid "A set of example debian/rules files that use debhelper."
msgstr ""
"Un ensemble d'exemples de fichiers debian/rules qui utilisent debhelper."
# type: =item
-#: debhelper.pod:511
+#: debhelper.pod:514
msgid "L<http://kitenet.net/~joey/code/debhelper/>"
msgstr "L<http://kitenet.net/~joey/code/debhelper/>"
# type: textblock
-#: debhelper.pod:513
+#: debhelper.pod:516
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:520 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:53
+#: dh_fixperms:116 dh_gconf:112 dh_gencontrol:85 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:522 dh_builddeb:95 dh_clean:138 dh_compress:198
+#: dh_fixperms:118 dh_gencontrol:87 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>"
@@ -1298,7 +1306,7 @@ msgstr ""
"plusieurs paquet(s) Debian."
# type: =head1
-#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:34
+#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:39
#: dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44
#: dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:51
#: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37
@@ -1357,31 +1365,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:108
+#: dh_gencontrol:81 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:110 dh_gencontrol:83 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."
@@ -1752,6 +1760,21 @@ msgstr ""
# type: textblock
#: dh_gconf:30
+#, fuzzy
+msgid ""
+"If a file named debian/package.gconf-mandatory exists, then it is installed "
+"into usr/share/gconf/mandatory/10_package in the package build directory, "
+"with \"package\" replaced by the package name, and similar postinst and "
+"postrm fragments will be generated."
+msgstr ""
+"S'il existe un fichier nommé debian/paquet.gconf-defaults, il sera installé "
+"dans le répertoire de construction du paquet sous usr/share/gconf/"
+"defaults/10_paquet où le mot S<« paquet »> sera remplacé par le nom du "
+"paquet. Certaines parties des scripts de maintenance postinst et postrm "
+"seront produites pour exécuter update-gconf-defaults."
+
+# type: textblock
+#: dh_gconf:35
msgid ""
"The gconf-schemas and update-gconf-defaults scripts are provided by the "
"gconf2 package. An appropriate dependency will be generated in ${misc:"
@@ -1762,12 +1785,12 @@ msgstr ""
"Depends}."
# type: =item
-#: dh_gconf:38
+#: dh_gconf:43
msgid "B<--priority> I<priority>"
msgstr "B<--priority> I<priorité>"
# type: textblock
-#: dh_gconf:40
+#: dh_gconf:45
msgid ""
"Use I<priority> (which should be a 2-digit number) as the defaults priority "
"instead of 10. Higher values than ten can be used by derived distributions "
@@ -1779,7 +1802,7 @@ msgstr ""
"(50), ou les paquets spécifiques à un site (90)."
# type: textblock
-#: dh_gconf:100
+#: dh_gconf:114
msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
msgstr "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
@@ -2466,7 +2489,7 @@ msgid "Do not modify postinst/prerm scripts."
msgstr "Empêche la modification des scripts de maintenance postinst et prerm."
# type: =item
-#: dh_installdocs:64 dh_installexamples:43 dh_install:51 dh_link:57
+#: dh_installdocs:64 dh_installexamples:43 dh_install:98 dh_link:57
#: dh_movefiles:44
msgid "B<-Xitem>, B<--exclude=item>"
msgstr "B<-Xélément>, B<--exclude=élément>"
@@ -2682,7 +2705,7 @@ msgstr ""
"construit (ou dans tous les paquets si -A est spécifié)."
# type: textblock
-#: dh_installexamples:45 dh_install:53 dh_movefiles:46
+#: dh_installexamples:45 dh_install:100 dh_movefiles:46
msgid ""
"Exclude files that contain \"item\" anywhere in their filename from being "
"installed."
@@ -3678,16 +3701,16 @@ msgstr ""
msgid ""
"From debhelper compatibility level 7 on, dh_install will fall back to "
"looking in debian/tmp for files, if it doesn't find them in the current "
-"directory (or whereever you've told it to look using --srcdir)."
+"directory (or whereever you've told it to look using --sourcedir)."
msgstr ""
# type: =item
-#: dh_install:56
+#: dh_install:51
msgid "B<--autodest>"
msgstr "B<--autodest>"
# type: textblock
-#: dh_install:58
+#: dh_install:53
msgid ""
"Guess as the destination directory to install things to. If this is "
"specified, you should not list destination directories in debian/package."
@@ -3701,7 +3724,7 @@ msgstr ""
"répertoires de destination selon la règle S<suivante :>"
# type: textblock
-#: dh_install:63
+#: dh_install:58
msgid ""
"Strip off debian/tmp (or the sourcedir if one is given) from the front of "
"the filename, if it is present, and install into the dirname of the "
@@ -3717,7 +3740,7 @@ msgstr ""
"installer est debian/tmp/etc/passwd, il sera copié dans debian/paquet/etc/."
# type: textblock
-#: dh_install:69
+#: dh_install:64
msgid ""
"Note that if you list exactly one filename or wildcard-pattern on a line by "
"itself in a debian/package.install file, with no explicit destination, then "
@@ -3730,6 +3753,21 @@ msgstr ""
"destination, même en l'absence de l'option B<--autodest>."
# type: =item
+#: dh_install:69
+msgid "B<--fail-missing>"
+msgstr "B<--fail-missing>"
+
+# type: textblock
+#: dh_install:71
+msgid ""
+"This option is like --list-missing, except if a file was missed, it will not "
+"only list the missing files, but also fail with a nonzero exit code."
+msgstr ""
+"Cette option est similaire à --list-missing, sauf que, si un fichier est "
+"oublié, cela produira non seulement un message sur stderr mais également un "
+"echec du programme avec une valeur de retour différente de zéro."
+
+# type: =item
#: dh_install:74
msgid "B<--list-missing>"
msgstr "B<--list-missing>"
@@ -3769,26 +3807,11 @@ msgstr ""
# type: =item
#: dh_install:87
-msgid "B<--fail-missing>"
-msgstr "B<--fail-missing>"
-
-# type: textblock
-#: dh_install:89
-msgid ""
-"This option is like --list-missing, except if a file was missed, it will not "
-"only list the missing files, but also fail with a nonzero exit code."
-msgstr ""
-"Cette option est similaire à --list-missing, sauf que, si un fichier est "
-"oublié, cela produira non seulement un message sur stderr mais également un "
-"echec du programme avec une valeur de retour différente de zéro."
-
-# type: =item
-#: dh_install:92
msgid "B<--sourcedir=dir>"
msgstr "B<--sourcedir=répertoire>"
# type: textblock
-#: dh_install:94
+#: dh_install:89
msgid ""
"Makes all source files be found under dir. If this is specified, it is akin "
"to all the source filenames having \"dir/\" prepended to them."
@@ -3798,7 +3821,7 @@ msgstr ""
"soient préfixés par S<« répertoire »>."
# type: textblock
-#: dh_install:97
+#: dh_install:92
msgid ""
"To make dh_install behave like the old dh_movefiles, move your package.files "
"file to package.install and call dh_install with \"--sourcedir=debian/tmp\" "
@@ -3827,12 +3850,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 +3871,7 @@ msgstr ""
"debian/toto.install qui S<contienne :>"
# type: verbatim
-#: dh_install:249
+#: dh_install:253
#, no-wrap
msgid ""
" usr/bin\n"
@@ -3860,12 +3883,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 +3898,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 +3907,7 @@ msgstr ""
"dev.install devra S<contenir :>"
# type: verbatim
-#: dh_install:258
+#: dh_install:262
#, no-wrap
msgid ""
" usr/include\n"
@@ -3898,12 +3921,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 +5191,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)>"
diff --git a/t/syntax b/t/syntax
index 76fd46a..f80fa97 100755
--- a/t/syntax
+++ b/t/syntax
@@ -1,7 +1,7 @@
#!/usr/bin/perl
use Test;
-my @progs=grep { -x $_ } glob("dh_*");
+my @progs=grep { -x $_ } glob("dh_*"), "dh";
my @libs=glob("Debian/Debhelper/*.pm");
plan(tests => (@progs + @libs));