Hello community,
here is the log from the commit of package deb for openSUSE:Factory
checked in at Tue Mar 3 22:19:37 CET 2009.
--------
--- deb/deb.changes 2009-01-20 10:03:09.000000000 +0100
+++ deb/deb.changes 2009-03-03 10:17:46.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Mar 3 10:10:53 CET 2009 - puzel@suse.cz
+
+- update to dpkg-1.15.0 and debhelper-7.2.1
+ - huge number of changes, please see
+ /usr/share/doc/packages/deb/dpkg/changelog and
+ /usr/share/doc/packages/deb/debhelper/changelog
+ for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
debhelper_7.1.1.tar.bz2
dpkg_1.14.21.tar.bz2
New:
----
debhelper_7.2.1.tar.bz2
dpkg_1.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deb.spec ++++++
--- /var/tmp/diff_new_pack.p30841/_old 2009-03-03 22:18:33.000000000 +0100
+++ /var/tmp/diff_new_pack.p30841/_new 2009-03-03 22:18:33.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package deb (Version 1.14.21)
+# spec file for package deb (Version 1.15.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,7 +17,7 @@
# norootforbuild
-%define debhelper_ver 7.1.1
+%define debhelper_ver 7.2.1
Name: deb
BuildRequires: gcc-c++ ncurses-devel texlive-latex update-alternatives zlib-devel
@@ -30,8 +30,8 @@
Requires: perl = %{perl_version}
Requires: cpio patch make html2text update-alternatives
AutoReqProv: on
-Version: 1.14.21
-Release: 12
+Version: 1.15.0
+Release: 1
Summary: Tools for Debian Packages
Source: dpkg_%{version}.tar.bz2
Source1: debhelper_%{debhelper_ver}.tar.bz2
@@ -169,6 +169,12 @@
%{perl_vendorlib}/Dpkg.pm
%changelog
+* Tue Mar 03 2009 puzel@suse.cz
+- update to dpkg-1.15.0 and debhelper-7.2.1
+ - huge number of changes, please see
+ /usr/share/doc/packages/deb/dpkg/changelog and
+ /usr/share/doc/packages/deb/debhelper/changelog
+ for details
* Tue Jan 20 2009 puzel@suse.cz
- partially revert change from Aug 12 2008 (bnc#467332)
* Thu Dec 18 2008 puzel@suse.cz
++++++ debhelper_7.1.1.tar.bz2 -> debhelper_7.2.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/autoscripts/postinst-gconf-defaults new/debhelper/autoscripts/postinst-gconf-defaults
--- old/debhelper/autoscripts/postinst-gconf-defaults 2007-12-31 23:45:13.000000000 +0100
+++ new/debhelper/autoscripts/postinst-gconf-defaults 2009-03-01 02:01:01.000000000 +0100
@@ -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 -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/autoscripts/postrm-gconf-defaults new/debhelper/autoscripts/postrm-gconf-defaults
--- old/debhelper/autoscripts/postrm-gconf-defaults 2007-12-31 23:45:13.000000000 +0100
+++ new/debhelper/autoscripts/postrm-gconf-defaults 2009-03-01 02:01:01.000000000 +0100
@@ -1,3 +1,3 @@
if which update-gconf-defaults >/dev/null 2>&1; then
- update-gconf-defaults
+ update-gconf-defaults #OPT#
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debhelper.pod new/debhelper/debhelper.pod
--- old/debhelper/debhelper.pod 2008-12-15 03:40:11.000000000 +0100
+++ new/debhelper/debhelper.pod 2009-03-01 02:01:01.000000000 +0100
@@ -366,8 +366,8 @@
=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 -
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debian/changelog new/debhelper/debian/changelog
--- old/debhelper/debian/changelog 2008-12-15 05:19:31.000000000 +0100
+++ new/debhelper/debian/changelog 2009-03-01 02:01:54.000000000 +0100
@@ -1,3 +1,25 @@
+debhelper (7.2.1) experimental; urgency=low
+
+ * Merged debhelper 7.0.52.
+
+ -- Joey Hess 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 Thu, 26 Feb 2009 18:33:44 -0500
+
debhelper (7.1.1) experimental; urgency=low
* dh_install(1): Order options alphabetically. Closes:# 503896
@@ -40,6 +62,38 @@
-- Joey Hess 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.
+ Closes: #517617
+
+ -- Joey Hess Sat, 28 Feb 2009 19:52:34 -0500
+
+debhelper (7.0.51) unstable; urgency=low
+
+ * dh: Man page typos. Closes: #517549, #517550
+
+ -- Joey Hess Sat, 28 Feb 2009 13:23:30 -0500
+
+debhelper (7.0.50) unstable; urgency=low
+
+ * This release is designed to be easily backportable to stable,
+ to support the new style of rules file that I expect many packages will
+ use.
+ * dh: debian/rules override targets can change what is run
+ for a specific debhelper command in a sequence.
+ (Thanks Modestas Vainius for the improved makefile parser.)
+ * dh: Redid all the examples to use override targets, since these
+ eliminate all annoying boilerplate and are much easier to understand
+ than the old method.
+ * Remove rules.simple example, there's little need to use explicit targets
+ with dh anymore.
+ * dh: Support debian/rules calling make with -B,
+ which is useful to avoid issues with phony implicit
+ rules (see bug #509756).
+
+ -- Joey Hess Fri, 27 Feb 2009 15:25:52 -0500
+
debhelper (7.0.17) unstable; urgency=low
[ Per Olofsson ]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debian/control new/debhelper/debian/control
--- old/debhelper/debian/control 2008-12-04 18:38:09.000000000 +0100
+++ new/debhelper/debian/control 2009-03-01 02:01:02.000000000 +0100
@@ -10,7 +10,7 @@
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 -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debian/rules new/debhelper/debian/rules
--- old/debhelper/debian/rules 2008-06-15 19:30:08.000000000 +0200
+++ new/debhelper/debian/rules 2009-02-27 21:31:05.000000000 +0100
@@ -5,6 +5,7 @@
# Each debhelper command in this rules file has to be run using ./run,
# to ensure that the commands and libraries in the source tree are used,
# rather than the installed ones.
+
%:
./run dh $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/Debian/Debhelper/Dh_Getopt.pm new/debhelper/Debian/Debhelper/Dh_Getopt.pm
--- old/debhelper/Debian/Debhelper/Dh_Getopt.pm 2008-12-15 04:09:26.000000000 +0100
+++ new/debhelper/Debian/Debhelper/Dh_Getopt.pm 2009-03-01 02:01:01.000000000 +0100
@@ -159,12 +159,20 @@
}
}
+ # 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) {
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($dh{V_FLAG})) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/Debian/Debhelper/Dh_Lib.pm new/debhelper/Debian/Debhelper/Dh_Lib.pm
--- old/debhelper/Debian/Debhelper/Dh_Lib.pm 2008-12-15 04:01:26.000000000 +0100
+++ new/debhelper/Debian/Debhelper/Dh_Lib.pm 2009-03-01 02:01:01.000000000 +0100
@@ -27,6 +27,7 @@
# 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 $@;
@@ -102,14 +103,20 @@
my $write_log=1;
sub END {
if ($? == 0 && $write_log) {
- my $cmd=basename($0);
- foreach my $package (@{$dh{DOPACKAGES}}) {
- my $ext=pkgext($package);
- my $log="debian/${ext}debhelper.log";
- open(LOG, ">>", $log) || error("failed to write to ${log}: $!");
- print LOG $cmd."\n";
- close LOG;
- }
+ write_log(basename($0), @{$dh{DOPACKAGES}});
+ }
+}
+
+sub write_log {
+ my $cmd=shift;
+ my @packages=@_;
+
+ foreach my $package (@packages) {
+ my $ext=pkgext($package);
+ my $log="debian/${ext}debhelper.log";
+ open(LOG, ">>", $log) || error("failed to write to ${log}: $!");
+ print LOG $cmd."\n";
+ close LOG;
}
}
@@ -155,8 +162,7 @@
verbose_print(escape_shell(@_));
if (! $dh{NO_ACT}) {
- my $ret=system(@_);
- $ret == 0 || error("command returned error code $ret");
+ system(@_) == 0 || _error_exitcode($_[0]);
}
}
@@ -169,11 +175,23 @@
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 -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh new/debhelper/dh
--- old/debhelper/dh 2008-10-31 18:19:02.000000000 +0100
+++ new/debhelper/dh 2009-03-01 02:01:04.000000000 +0100
@@ -11,7 +11,7 @@
=head1 SYNOPSIS
-B<dh> sequence [B<--until> I<cmd>] [B<--before> I<cmd>] [B<--after> I<cmd>] [B<--remaining>] [B<--with> I<addon>] [S]
+B<dh> sequence [B<--with> I<addon>] [B<--until> I<cmd>] [B<--before> I<cmd>] [B<--after> I<cmd>] [B<--remaining>] [S]
=head1 DESCRIPTION
@@ -34,10 +34,25 @@
in the sequence. The B<--until>, B<--before>, B<--after>, and B<--remaining>
options can override this behavior.
+If debian/rules contains a target with a name like "override_I",
+then when it gets to that command in the sequence, dh will run that
+target from the rules file, rather than running the actual command. The
+override target can then run the command with additional options, or run
+entirely different commands instead. (Note that to use this feature,
+you should Build-Depend on debhelper 7.0.50 or above.)
+
=head1 OPTIONS
=over 4
+=item B<--with> I<addon>
+
+Add the debhelper commands specified by the given addon to appropriate places
+in the sequence of commands that is run. This option can be repeated more
+than once, and is used when there is a third-party package that provides
+debhelper commands. See "SEQUENCE ADDONS" below for documentation about what
+such packages should do to be supported by --with.
+
=item B<--until> I<cmd>
Run commands in the sequence until and including I<cmd>, then stop.
@@ -54,14 +69,6 @@
Run all commands in the sequence that have yet to be run.
-=item B<--with> I<addon>
-
-Add the debhelper commands specified by the given addon to appropriate places
-in the sequence of commands that is run. This option can be repeated more
-than once, and is used when there is a third-party package that provides
-debhelper commands. See "SEQUENCE ADDONS" below for documentation about what
-such packages should do to be supported by --with.
-
=back
All other options passed to dh are passed on to each command it runs. This
@@ -137,84 +144,50 @@
%:
dh $@
-This is a simple rules file that is a good starting place for customisation.
-(It's also available in F
+Often you'll want to pass an option to a specific debhelper command. The
+easy way to do with is by adding an override target for that command.
+
+ #!/usr/bin/make -f
+ %:
+ dh $@
+
+ override_dh_strip:
+ dh_strip -Xfoo
+
+ override_dh_installdocs:
+ dh_installdocs README TODO
+
+Sometimes the automated dh_auto_configure and dh_auto_build can't guess
+what to do for a strange package. Here's how to avoid running either
+and instead run your own commands.
#!/usr/bin/make -f
+ %:
+ dh $@
- build: build-stamp
- build-stamp:
- dh build
- touch build-stamp
-
- clean:
- dh clean
-
- install: build install-stamp
- install-stamp:
- dh install
- touch install-stamp
-
- binary-arch: install
- dh binary-arch
-
- binary-indep: install
- dh binary-indep
-
- binary: binary-arch binary-indep
-
-Often you'll want to pass an option to ./configure. This uses dh to run all
-commands before L, then runs that command by hand,
-and then finishes up by running the rest of the sequence. You could also
-run ./configure by hand, instead of bothering with using dh_auto_configure.
-And if necessary, you can add commands to run automake, etc here too.
-
- build: build-stamp
- build-stamp:
- dh build --before configure
- dh_auto_configure -- --kitchen-sink=yes
- dh build --after configure
- touch build-stamp
-
-Here's how to skip two automated in a row (configure and build), and
-instead run the commands by hand.
-
- build: build-stamp
- build-stamp:
- dh build --before configure
+ override_dh_auto_configure:
./mondoconfig
+
+ override_dh_auto_build:
make universe-explode-in-delight
- dh build --after build
- touch build-stamp
-Another common case is wanting to run some code manually after a particular
-debhelper command is run.
+Another common case is wanting to do something manually before or
+after a particular debhelper command is run.
+
+ #!/usr/bin/make -f
+ %:
+ dh $@
- install: build install-stamp
- install-stamp:
- dh install --until dh_fixperms
- # dh_fixperms has run, now override it for one program
+ override_dh_fixperms:
+ dh_fixperms
chmod 4755 debian/foo/usr/bin/foo
- # and continue
- dh install --after dh_fixperms
- touch install-stamp
-
-It's also fine to run debhelper commands early. Just make sure that at
-least dh_prep is run from the sequence first, and be sure to use the
-B<--remaining> option to ensure that commands that normally come before
-those in the sequence are still run.
-
- install: build install-stamp
- install-stamp:
- dh install --until dh_prep
- dh_installdocs README TODO
- dh_installchangelogs Changes
- dh install --remaining
- touch install-stamp
-
- binary-arch: install
- dh_strip -X foo
- dh binary-arch --remaining
+
+If your package is a python package, dh will use dh_pysupport by
+default. This is how to use dh_pycentral instead.
+
+ #!/usr/bin/make -f
+ %:
+ dh --with python-central $@
=cut
@@ -354,8 +327,14 @@
error "specify a sequence to run";
}
my $sequence=shift;
-if (! exists $sequences{$sequence}) {
- error "Unknown sequence $sequence (chose from: ".
+if ($sequence eq 'debian/rules' ||
+ $sequence =~ /^override_dh_/) {
+ # make -B causes the rules file to be run as a target
+ # and support completly empty override targets
+ exit 0
+}
+elsif (! exists $sequences{$sequence}) {
+ error "Unknown sequence $sequence (choose from: ".
join(" ", sort keys %sequences).")";
}
my @sequence=@{$sequences{$sequence}};
@@ -406,7 +385,7 @@
# no commands remain to run after it, communicating to
# future dh instances that the specified command should not
# be run again.
- writelog($package, $sequence[$startpoint{$package}-1]);
+ writelog($sequence[$startpoint{$package}-1], $package);
}
elsif ($dh{REMAINING}) {
# Start at the beginning so all remaining commands will get
@@ -453,21 +432,33 @@
# Command already done for all packages.
next;
}
- elsif (! @exclude) {
- # Run command for all packages.
- run($sequence[$i], @options);
- }
- else {
- # Run command for only a subset of packages.
- run($sequence[$i], @options,
- map { "-N$_" } @exclude);
- }
+
+ run($sequence[$i], \@packages, \@exclude, @options);
}
sub run {
my $command=shift;
+ my @packages=@{shift()};
+ my @exclude=@{shift()};
my @options=@_;
+ # Check for override targets in debian/rules and
+ # run them instead of running the command directly.
+ my $override_command;
+ if (rules_explicit_target("override_".$command)) {
+ $override_command=$command;
+ # This passes the options through to commands called
+ # inside the target.
+ $ENV{DH_INTERNAL_OPTIONS}=join(" ", @options);
+ $command="debian/rules";
+ @options="override_".$override_command;
+ }
+ else {
+ # If some packages are excluded, add flags
+ # to prevent them from being acted on.
+ push @options, map { "-N$_" } @exclude;
+ }
+
# 3 space indent lines the command being run up under the
# sequence name after "dh ".
print " ".escape_shell($command, @options)."\n";
@@ -480,6 +471,16 @@
elsif ($ret) {
exit 1;
}
+
+ if (defined $override_command) {
+ delete $ENV{DH_INTERNAL_OPTIONS};
+ # Need to handle logging for overriden commands here,
+ # because the actual debhelper command may not have
+ # been run by the rules file target.
+ my %packages=map { $_ => 1 } @packages;
+ map { delete $packages{$_} } @exclude;
+ writelog($override_command, keys %packages);
+ }
}
}
@@ -497,15 +498,53 @@
close LOG;
return @log;
}
-
+
sub writelog {
- my $package=shift;
- my $cmd=shift;
- my $ext=pkgext($package);
+ Debian::Debhelper::Dh_Lib::write_log(@_);
+}
+
+{
+my %targets;
+my $rules_parsed;
+
+sub rules_explicit_target {
+ # Checks if a specified target exists as an explicit target
+ # in debian/rules.
+ my $target=shift;
- open(LOG, ">>", "debian/${ext}debhelper.log") || error("failed to write to log");
- print LOG $cmd."\n";
- close LOG;
+ if (! $rules_parsed) {
+ my $processing_targets = 0;
+ my $not_a_target = 0;
+ open(MAKE, "LANG=C make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |");
+ while (<MAKE>) {
+ if ($processing_targets) {
+ if (/^# Not a target:/) {
+ $not_a_target = 1;
+ }
+ else {
+ if (!$not_a_target && /^([^#:]+)::?/) {
+ # Target is defined.
+ # NOTE: if it is a depenency
+ # of .PHONY it will be
+ # defined too but that's ok.
+ $targets{$1} = 1;
+ }
+ # "Not a target:" is always followed by
+ # a target name, so resetting this one
+ # here is safe.
+ $not_a_target = 0;
+ }
+ } elsif (/^# Files$/) {
+ $processing_targets = 1;
+ }
+ }
+ close MAKE;
+ $rules_parsed = 1;
+ }
+
+ return exists $targets{$target};
+}
+
}
=head1 SEE ALSO
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_gconf new/debhelper/dh_gconf
--- old/debhelper/dh_gconf 2008-07-31 18:27:07.000000000 +0200
+++ new/debhelper/dh_gconf 2009-03-01 02:01:02.000000000 +0100
@@ -27,6 +27,11 @@
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 @@
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 -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_gencontrol new/debhelper/dh_gencontrol
--- old/debhelper/dh_gencontrol 2008-10-21 20:23:06.000000000 +0200
+++ new/debhelper/dh_gencontrol 2009-03-01 02:01:02.000000000 +0100
@@ -66,10 +66,6 @@
if (getpackages() > 1) {
push @command, "-p$package";
}
- if (is_udeb($package)) {
- push @command, "-UHomepage";
- push @command, "-n".udeb_filename($package);
- }
doit(@command, "-l$changelog", "-T$substvars",
"-P$tmp",@{$dh{U_PARAMS}});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_prep new/debhelper/dh_prep
--- old/debhelper/dh_prep 2008-07-31 18:27:07.000000000 +0200
+++ new/debhelper/dh_prep 2009-03-01 02:01:02.000000000 +0100
@@ -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 -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/doc/TODO new/debhelper/doc/TODO
--- old/debhelper/doc/TODO 2008-10-21 20:46:18.000000000 +0200
+++ new/debhelper/doc/TODO 2009-03-01 02:01:02.000000000 +0100
@@ -30,5 +30,5 @@
* 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
+ Need to wait a while (from Oct 2008) to ensure that most rules files
that pass unknown options to commands are fixed.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/examples/rules.simple new/debhelper/examples/rules.simple
--- old/debhelper/examples/rules.simple 2008-06-15 19:29:09.000000000 +0200
+++ new/debhelper/examples/rules.simple 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-#!/usr/bin/make -f
-
-build: build-stamp
-build-stamp:
- dh build
- touch build-stamp
-
-clean:
- dh clean
-
-install: build install-stamp
-install-stamp:
- dh install
- touch install-stamp
-
-binary-arch: install
- dh binary-arch
-
-binary-indep: install
- dh binary-indep
-
-binary: binary-arch binary-indep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/man/po4a/po/debhelper.pot new/debhelper/man/po4a/po/debhelper.pot
--- old/debhelper/man/po4a/po/debhelper.pot 2008-12-15 05:19:41.000000000 +0100
+++ new/debhelper/man/po4a/po/debhelper.pot 2009-03-01 02:02:38.000000000 +0100
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-12-14 23:19-0500\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 \n"
"Language-Team: LANGUAGE \n"
@@ -676,8 +676,8 @@
# 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
@@ -904,7 +904,7 @@
msgstr ""
# type: =head1
-#: debhelper.pod:506 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
+#: 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 ""
@@ -929,12 +929,12 @@
msgstr ""
# type: =head1
-#: debhelper.pod:520 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
+#: 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:522 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
+#: 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 "
msgstr ""
@@ -958,7 +958,7 @@
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 ""
@@ -1002,12 +1002,12 @@
msgstr ""
# type: textblock
-#: 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
+#: 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"
msgstr ""
# type: textblock
-#: 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
+#: 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 ""
@@ -1297,18 +1297,27 @@
# 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 "
@@ -1316,7 +1325,7 @@
msgstr ""
# type: textblock
-#: dh_gconf:100
+#: dh_gconf:114
msgid "Ross Burton Josselin Mouette "
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/man/po4a/po/es.po new/debhelper/man/po4a/po/es.po
--- old/debhelper/man/po4a/po/es.po 2008-12-15 05:19:44.000000000 +0100
+++ new/debhelper/man/po4a/po/es.po 2009-03-01 02:01:02.000000000 +0100
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-12-14 23:19-0500\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 \n"
"Language-Team: SPANISH \n"
@@ -901,8 +901,8 @@
# 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
@@ -1184,7 +1184,7 @@
# type: =head1
#: debhelper.pod:506 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_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
@@ -1220,7 +1220,7 @@
# type: =head1
#: debhelper.pod:520 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_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
@@ -1237,7 +1237,7 @@
# type: textblock
#: debhelper.pod:522 dh_builddeb:95 dh_clean:138 dh_compress:198
-#: dh_fixperms:118 dh_gencontrol:91 dh_installchangelogs:148 dh_installcron:69
+#: 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
@@ -1275,7 +1275,7 @@
"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
@@ -1333,8 +1333,8 @@
msgstr "Pasa I a L cuando se construye el paquete."
# type: textblock
-#: 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_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
@@ -1349,7 +1349,7 @@
# type: textblock
#: 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_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
@@ -1724,6 +1724,19 @@
# 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:"
@@ -1731,13 +1744,13 @@
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 "
@@ -1745,7 +1758,7 @@
msgstr ""
# type: textblock
-#: dh_gconf:100
+#: dh_gconf:114
#, fuzzy
msgid "Ross Burton Josselin Mouette "
msgstr "Josselin Mouette "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/man/po4a/po/fr.po new/debhelper/man/po4a/po/fr.po
--- old/debhelper/man/po4a/po/fr.po 2008-12-15 05:19:47.000000000 +0100
+++ new/debhelper/man/po4a/po/fr.po 2009-03-01 02:01:02.000000000 +0100
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2008-12-14 23:19-0500\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 \n"
"Language-Team: French \n"
@@ -923,8 +923,8 @@
# 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
@@ -1214,7 +1214,7 @@
# type: =head1
#: debhelper.pod:506 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_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
@@ -1251,7 +1251,7 @@
# type: =head1
#: debhelper.pod:520 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_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
@@ -1268,7 +1268,7 @@
# type: textblock
#: debhelper.pod:522 dh_builddeb:95 dh_clean:138 dh_compress:198
-#: dh_fixperms:118 dh_gencontrol:91 dh_installchangelogs:148 dh_installcron:69
+#: 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
@@ -1306,7 +1306,7 @@
"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
@@ -1365,8 +1365,8 @@
"Fournit les I à L lors de la construction du paquet."
# type: textblock
-#: 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_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
@@ -1381,7 +1381,7 @@
# type: textblock
#: 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_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
@@ -1760,6 +1760,21 @@
# 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:"
@@ -1770,12 +1785,12 @@
"Depends}."
# type: =item
-#: dh_gconf:38
+#: dh_gconf:43
msgid "B<--priority> I<priority>"
msgstr "B<--priority> I"
# 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 "
@@ -1787,7 +1802,7 @@
"(50), ou les paquets spécifiques à un site (90)."
# type: textblock
-#: dh_gconf:100
+#: dh_gconf:114
msgid "Ross Burton Josselin Mouette "
msgstr "Ross Burton Josselin Mouette "
++++++ dpkg_1.14.21.tar.bz2 -> dpkg_1.15.0.tar.bz2 ++++++
++++ 451219 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org