From 3452c83477fac565ba5133064a108a2131232a40 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 1 Sep 2018 06:48:02 +0000 Subject: Dh_Lib.pm: Have isnative() use the cache better for d/changelog Signed-off-by: Niels Thykier --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fe0c72f9..be217b62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,11 @@ debhelper (11.4) UNRELEASED; urgency=medium issue. * dh_installdeb: In compat 12, ignore the maintainer provided conffiles. It has not been useful since compat 3. + * Dh_Lib.pm: isnative() now also resets $dh{VERSION} as a side-effect when + using the cache to answer the request. This is mostly useful because + it enables the following optimization. + * Dh_Lib.pm: Have isnative() special-case debian/changelog to avoid + reparsing that file over and over in the same helper. [ Juhani Numminen ] * dh_installsystemd.1: Fix typo in manpage. -- cgit v1.2.3 From 870c68859ac2218ccad373eff3ff8c81f73ab2c8 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 1 Sep 2018 06:55:55 +0000 Subject: d/changelog: Document Fabian's changes Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index be217b62..277bb1be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ debhelper (11.4) UNRELEASED; urgency=medium * dh_installsystemd.1: Fix typo in manpage. * dh_installinit.1: Ditto. + [ Fabian Wolff ] + * dh_installdocs.1: Fix typo. + * dh_link.1: Ditto. + -- Niels Thykier Wed, 01 Aug 2018 10:27:22 +0000 debhelper (11.3.5) unstable; urgency=medium -- cgit v1.2.3 From 39953a681f18030fbc93a27638dc2efc64957c77 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 2 Sep 2018 09:25:40 +0000 Subject: Have helpers explicitly declare the --priority parameter The Dh_Lib library currently defines a number of built-in parameters for all helpers by default. However, some of these parameters turn out to be rarely used (--priority being one of them). This change is an effort to reduce the number of unused parameters supported by Dh_Lib by default. Related MRs: https://salsa.debian.org/tex-team/tex-common/merge_requests/1/diffs Signed-off-by: Niels Thykier --- debian/changelog | 6 ++++++ dh_gconf | 4 +++- dh_installemacsen | 1 + dh_installgsettings | 4 +++- dh_installudev | 4 +++- dh_installwm | 4 +++- 6 files changed, 19 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 277bb1be..bfd6e682 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,12 @@ debhelper (11.4) UNRELEASED; urgency=medium it enables the following optimization. * Dh_Lib.pm: Have isnative() special-case debian/changelog to avoid reparsing that file over and over in the same helper. + * dh_gconf: Explicitly declare the --priority parameter with the intend + to remove it from the default debhelper options in a later release. + * dh_installemacsen: Ditto. + * dh_installgsettings: Ditto. + * dh_installudev: Ditto. + * dh_installwm: Ditto. [ Juhani Numminen ] * dh_installsystemd.1: Fix typo in manpage. diff --git a/dh_gconf b/dh_gconf index 74c04a35..1860085e 100755 --- a/dh_gconf +++ b/dh_gconf @@ -54,7 +54,9 @@ packages (B<90>). =cut -init(); +init(options => { + "priority=s" => \$dh{PRIORITY}, +}); my $priority=10; if (defined $dh{PRIORITY}) { diff --git a/dh_installemacsen b/dh_installemacsen index 2e19c1f6..955eb291 100755 --- a/dh_installemacsen +++ b/dh_installemacsen @@ -82,6 +82,7 @@ instances of the same text to be added to maintainer scripts. init(options => { "flavor=s" => \$dh{FLAVOR}, + "priority=s" => \$dh{PRIORITY}, }); if (! defined $dh{PRIORITY}) { diff --git a/dh_installgsettings b/dh_installgsettings index faedcb7c..05fc9b1e 100755 --- a/dh_installgsettings +++ b/dh_installgsettings @@ -55,7 +55,9 @@ packages (90). =cut -init(); +init(options => { + "priority=s" => \$dh{PRIORITY}, +}); my $priority=10; if (defined $dh{PRIORITY}) { diff --git a/dh_installudev b/dh_installudev index cab558ba..1f1168be 100755 --- a/dh_installudev +++ b/dh_installudev @@ -55,7 +55,9 @@ instances of the same text to be added to maintainer scripts. =cut -init(); +init(options => { + "priority=s" => \$dh{PRIORITY}, +}); # The priority used to look like z60_; # we need to calculate that old value to handle diff --git a/dh_installwm b/dh_installwm index 280a6b1e..b23e47e6 100755 --- a/dh_installwm +++ b/dh_installwm @@ -68,7 +68,9 @@ instances of the same text to be added to maintainer scripts. =cut -init(); +init(options => { + "priority=s" => \$dh{PRIORITY}, +}); if (! defined $dh{PRIORITY}) { $dh{PRIORITY}=20; -- cgit v1.2.3 From 8e9e73464c3da06ca315006e9ea5da6833780d14 Mon Sep 17 00:00:00 2001 From: Nicholas Guriev Date: Sun, 2 Sep 2018 15:50:27 +0300 Subject: Support of terse flag in DEB_BUILD_OPTIONS * Also fix using of the QUIET internal setting in autoconf and cmake build systems. --- debian/changelog | 4 ++++ lib/Debian/Debhelper/Buildsystem/autoconf.pm | 4 ++-- lib/Debian/Debhelper/Buildsystem/cmake.pm | 6 ++++-- lib/Debian/Debhelper/Dh_Lib.pm | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bfd6e682..a18a7f64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,10 @@ debhelper (11.4) UNRELEASED; urgency=medium * dh_installdocs.1: Fix typo. * dh_link.1: Ditto. + [ Nicholas Guriev ] + * cmake.pm, autoconf.pm: honor QUIET setting (closes: #907738). + * Dh_Lib.pm: use terse build option to set QUIET setting (closes: #907595). + -- Niels Thykier Wed, 01 Aug 2018 10:27:22 +0000 debhelper (11.3.5) unstable; urgency=medium diff --git a/lib/Debian/Debhelper/Buildsystem/autoconf.pm b/lib/Debian/Debhelper/Buildsystem/autoconf.pm index 142c27ea..70d3511e 100644 --- a/lib/Debian/Debhelper/Buildsystem/autoconf.pm +++ b/lib/Debian/Debhelper/Buildsystem/autoconf.pm @@ -8,7 +8,7 @@ package Debian::Debhelper::Buildsystem::autoconf; use strict; use warnings; -use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value sourcepackage compat); +use Debian::Debhelper::Dh_Lib qw(%dh dpkg_architecture_value sourcepackage compat); use parent qw(Debian::Debhelper::Buildsystem::makefile); sub DESCRIPTION { @@ -38,7 +38,7 @@ sub configure { push @opts, "--infodir=\${prefix}/share/info"; push @opts, "--sysconfdir=/etc"; push @opts, "--localstatedir=/var"; - if (defined $ENV{DH_QUIET} && $ENV{DH_QUIET} ne "") { + if ($dh{QUIET}) { push @opts, "--enable-silent-rules"; } else { push @opts, "--disable-silent-rules"; diff --git a/lib/Debian/Debhelper/Buildsystem/cmake.pm b/lib/Debian/Debhelper/Buildsystem/cmake.pm index c732ba41..b2364a59 100644 --- a/lib/Debian/Debhelper/Buildsystem/cmake.pm +++ b/lib/Debian/Debhelper/Buildsystem/cmake.pm @@ -8,12 +8,11 @@ package Debian::Debhelper::Buildsystem::cmake; use strict; use warnings; -use Debian::Debhelper::Dh_Lib qw(compat dpkg_architecture_value error is_cross_compiling); +use Debian::Debhelper::Dh_Lib qw(%dh compat dpkg_architecture_value error is_cross_compiling); use parent qw(Debian::Debhelper::Buildsystem); my @STANDARD_CMAKE_FLAGS = qw( -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var @@ -85,6 +84,9 @@ sub configure { my $generator = $TARGET_BUILD_SYSTEM2CMAKE_GENERATOR{$backend}; push(@flags, "-G${generator}"); } + unless ($dh{QUIET}) { + push(@flags, "-DCMAKE_VERBOSE_MAKEFILE=ON"); + } if ($ENV{CC}) { push @flags, "-DCMAKE_C_COMPILER=" . $ENV{CC}; diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm index f6c3fc51..9359eb27 100644 --- a/lib/Debian/Debhelper/Dh_Lib.pm +++ b/lib/Debian/Debhelper/Dh_Lib.pm @@ -255,7 +255,7 @@ sub init { # make sure verbose is on. Otherwise, check DH_QUIET. if (defined $ENV{DH_VERBOSE} && $ENV{DH_VERBOSE} ne "") { $dh{VERBOSE}=1; - } elsif (defined $ENV{DH_QUIET} && $ENV{DH_QUIET} ne "") { + } elsif (defined $ENV{DH_QUIET} && $ENV{DH_QUIET} ne "" || get_buildoption("terse")) { $dh{QUIET}=1; } -- cgit v1.2.3 From 89addaff807b5f67dcd6b0287314da7eaf2826f1 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 2 Sep 2018 15:22:09 +0000 Subject: Dh_Getopt.pm: Remove --priority as default option Signed-off-by: Niels Thykier --- debian/changelog | 5 ++++- lib/Debian/Debhelper/Dh_Getopt.pm | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a18a7f64..1f9be294 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,11 +34,14 @@ debhelper (11.4) UNRELEASED; urgency=medium * Dh_Lib.pm: Have isnative() special-case debian/changelog to avoid reparsing that file over and over in the same helper. * dh_gconf: Explicitly declare the --priority parameter with the intend - to remove it from the default debhelper options in a later release. + to remove it from the default debhelper options. * dh_installemacsen: Ditto. * dh_installgsettings: Ditto. * dh_installudev: Ditto. * dh_installwm: Ditto. + * Dh_Getopt.pm: Remove --priority from the list of options supported by all + debhelper tools. The only external consumer was was dh_installtex from + tex-common, which was fixed in 6.10. [ Juhani Numminen ] * dh_installsystemd.1: Fix typo in manpage. diff --git a/lib/Debian/Debhelper/Dh_Getopt.pm b/lib/Debian/Debhelper/Dh_Getopt.pm index 0eb3de04..dd96480b 100644 --- a/lib/Debian/Debhelper/Dh_Getopt.pm +++ b/lib/Debian/Debhelper/Dh_Getopt.pm @@ -144,8 +144,6 @@ sub getoptions { "A" => \$dh{PARAMS_ALL}, "all" => \$dh{PARAMS_ALL}, - "priority=s" => \$dh{PRIORITY}, - "h|help" => \&showhelp, "mainpackage=s" => \$dh{MAINPACKAGE}, -- cgit v1.2.3 From 090b7310810e6e65d4583a92df62525856bf5588 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 2 Sep 2018 19:28:44 +0200 Subject: Fix typo in debian/changelog Thanks lintian! --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1f9be294..3c3774ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,7 +40,7 @@ debhelper (11.4) UNRELEASED; urgency=medium * dh_installudev: Ditto. * dh_installwm: Ditto. * Dh_Getopt.pm: Remove --priority from the list of options supported by all - debhelper tools. The only external consumer was was dh_installtex from + debhelper tools. The only external consumer was dh_installtex from tex-common, which was fixed in 6.10. [ Juhani Numminen ] -- cgit v1.2.3 From 39237c03c59c5de6dde9dd8b5f51ecc2d9998451 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 2 Sep 2018 07:26:49 +0000 Subject: Document dh_install{init,systemd} changes Signed-off-by: Niels Thykier --- debhelper.pod | 16 ++++++++++++++++ debian/changelog | 4 ++++ 2 files changed, 20 insertions(+) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index acdda660..854976a6 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -869,6 +869,22 @@ F file. The file has mostly been obsolete since compatibility level 3, where B began to automatically compute the resulting F control file. +=item - + +The B tool no longer relies on B for +handling systemd services that have a sysvinit alternative. Both tools +must now be used in such a case to ensure the service is properly started +under both sysvinit and systemd. + +If you have an override for B (e.g. to call it with +B<--no-start>) then you will probably need one for +B as well now. + +This change makes B inject a I for +B<< init-system-helpers (>= 1.54~) >>. Please ensure that the package +lists B<${misc:Pre-Depends}> in its B field before +upgrading to compat 12. + =back =back diff --git a/debian/changelog b/debian/changelog index 3c3774ff..c33d1d7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,10 @@ debhelper (11.4) UNRELEASED; urgency=medium * Dh_Getopt.pm: Remove --priority from the list of options supported by all debhelper tools. The only external consumer was dh_installtex from tex-common, which was fixed in 6.10. + * dh_installinit: In compat 12, pass --skip-systemd-native to update-rc.d + to make it ignore systemd services. + * dh_installsystemd: In compat 12, avoid relying on dh_installinit's + shell snippets for starting services. (Closes: #887904, #887900) [ Juhani Numminen ] * dh_installsystemd.1: Fix typo in manpage. -- cgit v1.2.3 From 54b99b0ff92f6abfc6711e6687e847d192bd69de Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 3 Sep 2018 19:16:19 +0000 Subject: dh_installinit: Drop redundant systemd-related auto-snippet Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ dh_installinit | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c33d1d7e..eb0c3e6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,10 @@ debhelper (11.4) UNRELEASED; urgency=medium to make it ignore systemd services. * dh_installsystemd: In compat 12, avoid relying on dh_installinit's shell snippets for starting services. (Closes: #887904, #887900) + * dh_installinit: Drop unnecessary "systemctl daemon-reload" in + auto-generated postrm script. The systemd package has a trigger for + handling sysvinit scripts and dh_installsystemd handles the requirement + for native systemd unit files. [ Juhani Numminen ] * dh_installsystemd.1: Fix typo in manpage. diff --git a/dh_installinit b/dh_installinit index 8341fb8c..9189b7a7 100755 --- a/dh_installinit +++ b/dh_installinit @@ -418,10 +418,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) { autoscript($package,"postrm","postrm-init", { 'SCRIPT' => $script, 'ERROR_HANDLER' => $dh{ERROR_HANDLER} }, \%snippet_options); - - if (compat(11)) { - autoscript($package, 'postrm', 'postrm-systemd-reload-only', \%snippet_options); - } } } } -- cgit v1.2.3 From 8cf9d0bdcc773ea199ddb90b7957f353bfb0e686 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 9 Sep 2018 12:49:35 +0000 Subject: Make -k/--keep a per helper option --- debian/changelog | 8 ++++++++ dh_clean | 1 + dh_installchangelogs | 4 +++- dh_strip | 2 +- doc/PROGRAMMING | 1 - lib/Debian/Debhelper/Dh_Getopt.pm | 5 +---- 6 files changed, 14 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index eb0c3e6d..baac967c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,14 @@ debhelper (11.4) UNRELEASED; urgency=medium auto-generated postrm script. The systemd package has a trigger for handling sysvinit scripts and dh_installsystemd handles the requirement for native systemd unit files. + * dh_clean: Explicitly declare the -k/--keep parameter with the intend + to remove it from the default debhelper options. + * dh_installchangelogs: Ditto. + * dh_strip: Ditto. + * Dh_Getopt.pm: Remove -k/--keep from the list of options supported by all + debhelper tools. The only external consumer was dh_gtkmodules which is now + deprecated and a "noop" dh_installtex. No consumers of dh_gtkmodules + appear to pass -k/--keep to dh_gtkmodules any longer. [ Juhani Numminen ] * dh_installsystemd.1: Fix typo in manpage. diff --git a/dh_clean b/dh_clean index 15466a9b..192ace29 100755 --- a/dh_clean +++ b/dh_clean @@ -78,6 +78,7 @@ slash. Any content in these directories will be removed as well. init(options => { "dirs-only" => \$dh{D_FLAG}, + "keep|k" => \$dh{K_FLAG}, }); inhibit_log(); diff --git a/dh_installchangelogs b/dh_installchangelogs index 8eb9e190..5dcbaf5f 100755 --- a/dh_installchangelogs +++ b/dh_installchangelogs @@ -147,7 +147,9 @@ sub install_binNMU_changelog { } } -init(); +init(options => { + 'keep|k' => \$dh{K_FLAG}, +}); my $news_name="NEWS.Debian"; my $changelog_name="changelog.Debian"; diff --git a/dh_strip b/dh_strip index d345c696..070f9ead 100755 --- a/dh_strip +++ b/dh_strip @@ -137,7 +137,7 @@ Debian policy, version 3.0.1 =cut init(options => { - "keep-debug" => \$dh{K_FLAG}, + 'keep-debug|keep|k' => \$dh{K_FLAG}, 'dbgsym-migration=s' => \$dh{MIGRATE_DBGSYM}, 'automatic-dbgsym!' => \$dh{ENABLE_DBGSYM}, # Deprecated variants diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING index 5d15b41e..3671f949 100644 --- a/doc/PROGRAMMING +++ b/doc/PROGRAMMING @@ -114,7 +114,6 @@ switch variable description only be used inside complex_doit(), not in doit(). -d D_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 diff --git a/lib/Debian/Debhelper/Dh_Getopt.pm b/lib/Debian/Debhelper/Dh_Getopt.pm index dd96480b..8afdd308 100644 --- a/lib/Debian/Debhelper/Dh_Getopt.pm +++ b/lib/Debian/Debhelper/Dh_Getopt.pm @@ -107,7 +107,7 @@ sub getoptions { "arch" => \&AddPackage, "p=s" => \&AddPackage, - "package=s" => \&AddPackage, + "package=s" => \&AddPackage, "N=s" => \&ExcludePackage, "no-package=s" => \&ExcludePackage, @@ -131,9 +131,6 @@ sub getoptions { "d" => \$dh{D_FLAG}, - "k" => \$dh{K_FLAG}, - "keep" => \$dh{K_FLAG}, - "P=s" => \$dh{TMPDIR}, "tmpdir=s" => \$dh{TMPDIR}, -- cgit v1.2.3 From 4591c8237a13de994118e32c3593ef53b1600d29 Mon Sep 17 00:00:00 2001 From: Clément Hermann Date: Wed, 12 Sep 2018 11:17:36 +0200 Subject: debhelper.pod: Document dh_golang's DH_GOLANG_EXCLUDES behaviour change --- debhelper.pod | 8 ++++++++ debian/changelog | 4 ++++ 2 files changed, 12 insertions(+) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index 854976a6..c32a09c5 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -885,6 +885,14 @@ B<< init-system-helpers (>= 1.54~) >>. Please ensure that the package lists B<${misc:Pre-Depends}> in its B field before upgrading to compat 12. +=item - + +The third-party B tool (from B package) now defaults on +honoring B variable for source installation in -dev +packages and not only during the building process. Please set +B to false to revert to the previous behaviour. See +B for details and examples. + =back =back diff --git a/debian/changelog b/debian/changelog index baac967c..30b97aac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,10 @@ debhelper (11.4) UNRELEASED; urgency=medium * cmake.pm, autoconf.pm: honor QUIET setting (closes: #907738). * Dh_Lib.pm: use terse build option to set QUIET setting (closes: #907595). + [ Clément Hermann ] + * debhelper.pod: Document dh_golang's DH_GOLANG_EXCLUDES behaviour change + for compat 12 (closes: #908656) + -- Niels Thykier Wed, 01 Aug 2018 10:27:22 +0000 debhelper (11.3.5) unstable; urgency=medium -- cgit v1.2.3 From 8d2a3ad4598543320fac2bcee58cbefd3c302f08 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 14 Sep 2018 18:59:32 +0000 Subject: d/changelog: Add changelog entries for recent changes Signed-off-by: Niels Thykier --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 30b97aac..9fd7240b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,13 @@ debhelper (11.4) UNRELEASED; urgency=medium debhelper tools. The only external consumer was dh_gtkmodules which is now deprecated and a "noop" dh_installtex. No consumers of dh_gtkmodules appear to pass -k/--keep to dh_gtkmodules any longer. + * dh: Rewrite command line optimization logic to enable support for a new + NOOP PROMISE for command line options. This will make dh able to skip + helpers in some cases even when passed options. (Closes: #866581) + * dh_*: Add a NOOP PROMISE for command options where applicable. + * dh: Remove old compatibility code from compat 10 that never worked. + * Dh_Getopt.pm: Fix a bug that would make "-S" be interpreted as "-s" when + "-S" was not given an argument. [ Juhani Numminen ] * dh_installsystemd.1: Fix typo in manpage. -- cgit v1.2.3 From b04224a7dc6b4ca5feee711a1b183fdf49d7762a Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 14 Sep 2018 19:37:37 +0000 Subject: d/changelog: Improve wording of an entry Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9fd7240b..2efd6128 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,8 +56,8 @@ debhelper (11.4) UNRELEASED; urgency=medium * dh_strip: Ditto. * Dh_Getopt.pm: Remove -k/--keep from the list of options supported by all debhelper tools. The only external consumer was dh_gtkmodules which is now - deprecated and a "noop" dh_installtex. No consumers of dh_gtkmodules - appear to pass -k/--keep to dh_gtkmodules any longer. + deprecated and a "noop" command. No consumers of dh_gtkmodules appear to + pass -k/--keep to dh_gtkmodules any longer. * dh: Rewrite command line optimization logic to enable support for a new NOOP PROMISE for command line options. This will make dh able to skip helpers in some cases even when passed options. (Closes: #866581) -- cgit v1.2.3 From 455914e2676680bf4d6bc97d159790391fe7cf11 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 14 Sep 2018 20:35:21 +0000 Subject: d/changelog: Fix typo Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2efd6128..6a4641e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,7 +33,7 @@ debhelper (11.4) UNRELEASED; urgency=medium it enables the following optimization. * Dh_Lib.pm: Have isnative() special-case debian/changelog to avoid reparsing that file over and over in the same helper. - * dh_gconf: Explicitly declare the --priority parameter with the intend + * dh_gconf: Explicitly declare the --priority parameter with the intention to remove it from the default debhelper options. * dh_installemacsen: Ditto. * dh_installgsettings: Ditto. @@ -50,7 +50,7 @@ debhelper (11.4) UNRELEASED; urgency=medium auto-generated postrm script. The systemd package has a trigger for handling sysvinit scripts and dh_installsystemd handles the requirement for native systemd unit files. - * dh_clean: Explicitly declare the -k/--keep parameter with the intend + * dh_clean: Explicitly declare the -k/--keep parameter with the intention to remove it from the default debhelper options. * dh_installchangelogs: Ditto. * dh_strip: Ditto. -- cgit v1.2.3 From ceed7abddce1b57b2e48570065ad78362f040474 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 14 Sep 2018 20:41:02 +0000 Subject: Bump S-V to 4.2.1 - no changes required Signed-off-by: Niels Thykier --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6a4641e3..d560d94f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,6 +65,7 @@ debhelper (11.4) UNRELEASED; urgency=medium * dh: Remove old compatibility code from compat 10 that never worked. * Dh_Getopt.pm: Fix a bug that would make "-S" be interpreted as "-s" when "-S" was not given an argument. + * debian/control: Bump Standards-Versions to 4.2.1 - no changes required. [ Juhani Numminen ] * dh_installsystemd.1: Fix typo in manpage. diff --git a/debian/control b/debian/control index e7abda31..0ba40652 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: dpkg-dev (>= 1.18.0~), perl:any, po4a, Rules-Requires-Root: no -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 Testsuite: autopkgtest-pkg-perl Vcs-Git: https://salsa.debian.org/debian/debhelper.git Vcs-Browser: https://salsa.debian.org/debian/debhelper -- cgit v1.2.3 From c4063915d875f879760e6225b454223d17782932 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 14 Sep 2018 20:49:47 +0000 Subject: debhelper.pod: Compat 12 is now in beta Signed-off-by: Niels Thykier --- debhelper.pod | 2 +- debian/changelog | 1 + strings-kept-translations.pod | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index 396c018e..d39c4324 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -771,7 +771,7 @@ This change may cause the tools to process more files than previously. =item v12 -This compatibility level is still open for development; use with caution. +This compatibility level is open for beta testing; changes may occur. Changes from v11 are: diff --git a/debian/changelog b/debian/changelog index d560d94f..20695e42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,7 @@ debhelper (11.4) UNRELEASED; urgency=medium * Dh_Getopt.pm: Fix a bug that would make "-S" be interpreted as "-s" when "-S" was not given an argument. * debian/control: Bump Standards-Versions to 4.2.1 - no changes required. + * debhelper.pod: Declare compat 12 in beta testing. [ Juhani Numminen ] * dh_installsystemd.1: Fix typo in manpage. diff --git a/strings-kept-translations.pod b/strings-kept-translations.pod index 457b40da..1c6aab2a 100644 --- a/strings-kept-translations.pod +++ b/strings-kept-translations.pod @@ -6,5 +6,7 @@ This compatibility level is open for beta testing; changes may occur. +This compatibility level is still open for development; use with caution. + =cut -- cgit v1.2.3 From 147350816049aecaed3f9a859e70128705c25af8 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 14 Sep 2018 20:57:40 +0000 Subject: Release debhelper/11.4 into unstable Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 20695e42..50e4c9fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (11.4) UNRELEASED; urgency=medium +debhelper (11.4) unstable; urgency=medium [ Niels Thykier ] * dh_dwz.1: Remove now obsolete note in manpage claming that dh_dwz @@ -84,7 +84,7 @@ debhelper (11.4) UNRELEASED; urgency=medium * debhelper.pod: Document dh_golang's DH_GOLANG_EXCLUDES behaviour change for compat 12 (closes: #908656) - -- Niels Thykier Wed, 01 Aug 2018 10:27:22 +0000 + -- Niels Thykier Fri, 14 Sep 2018 20:56:55 +0000 debhelper (11.3.5) unstable; urgency=medium -- cgit v1.2.3 From a5ad57b793e4c87cdec2bb0728aa06226babe87b Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 16 Sep 2018 06:57:47 +0000 Subject: debhelper.pod: Quote value of INSTALL in c11 description Signed-off-by: Niels Thykier --- debhelper.pod | 4 ++-- debian/changelog | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index d39c4324..145153b0 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -659,8 +659,8 @@ The vast majority of all packages will be unaffected by this change. =item - -The B buildsystem now passes B to L. Derivative buildsystems +The B buildsystem now passes B to L. Derivative buildsystems (e.g. B or B) are unaffected by this change. =item - diff --git a/debian/changelog b/debian/changelog index 50e4c9fc..c6bedcf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (11.4.1) UNRELEASED; urgency=medium + + * debhelper.pod: Quote the value of INSTALL in description of + compat level 11. Thanks to Josh Triplett for the suggestion + (Closes: #908906) + + -- Niels Thykier Sun, 16 Sep 2018 06:56:12 +0000 + debhelper (11.4) unstable; urgency=medium [ Niels Thykier ] -- cgit v1.2.3 From 818ba28093f5192e2537fd446ad8df86a71a2416 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 16 Sep 2018 07:37:53 +0000 Subject: d/changelog: Add changelog entries for Josh Triplett's commits Signed-off-by: Niels Thykier --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c6bedcf6..049b782f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,18 @@ debhelper (11.4.1) UNRELEASED; urgency=medium + [ Niels Thykier ] * debhelper.pod: Quote the value of INSTALL in description of compat level 11. Thanks to Josh Triplett for the suggestion (Closes: #908906) + [ Josh Triplett ] + * debhelper.pod: Document how to declare the debhelper compat + level via the "debhelper-compat (= X)"-method. + (Closes: #908909) + * debhelper.pod: Document that we do not provide debhelper-compat + for experimental/beta versions of compat levels. + (Closes: #908907) + -- Niels Thykier Sun, 16 Sep 2018 06:56:12 +0000 debhelper (11.4) unstable; urgency=medium -- cgit v1.2.3 From 54cdea57b6340035805099e9c219746dead438eb Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 21 Sep 2018 18:17:53 +0000 Subject: d/changelog: Fix typos Signed-off-by: Niels Thykier --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 049b782f..92d5e0bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ debhelper (11.4.1) UNRELEASED; urgency=medium * debhelper.pod: Quote the value of INSTALL in description of compat level 11. Thanks to Josh Triplett for the suggestion (Closes: #908906) + * d/changelog: Fix typos in old entries. [ Josh Triplett ] * debhelper.pod: Document how to declare the debhelper compat @@ -220,7 +221,7 @@ debhelper (11.3) unstable; urgency=medium Robie Basak for spotting the contradicting documentation. (Closes: #898161) * dh_compress: Avoid adding a duplicate ".gz" extension on - a symlink if it already has it. This can happen e.g. with + a symlink if it already has it. This can happen e.g. with dh_installman recompresses a manpage that was compressed and had a valid symlink to it. Thanks to Andreas Hasenack for reporting the bug. (Closes: LP: #1765851) @@ -1362,7 +1363,7 @@ debhelper (10.5) unstable; urgency=medium * Dh_Lib.pm: Emulate "install -d" with File::Path to avoid a fork+exec for creating directories. For simplicity, the verbose output still claim debhelper uses "install -d" for this. - * dh_auto_install: In compat 11, do noot create package build + * dh_auto_install: In compat 11, do not create package build directories (except if one of them happens to be the default "destdir" for dh_auto_install). -- cgit v1.2.3 From 423cfce04719f41d7224d75155c4e7f9a97a10e9 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 21 Sep 2018 18:23:49 +0000 Subject: dh_strip: Remove empty dirs caused by dh_dwz's output Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_strip | 1 + 2 files changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 92d5e0bc..7b4883ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ debhelper (11.4.1) UNRELEASED; urgency=medium compat level 11. Thanks to Josh Triplett for the suggestion (Closes: #908906) * d/changelog: Fix typos in old entries. + * dh_strip: Remove empty /usr/lib/debug directories left over + by dh_dwz. Thanks to Ferenc Wágner for reporting the issue. + (Closes: #909303) [ Josh Triplett ] * debhelper.pod: Document how to declare the debhelper compat diff --git a/dh_strip b/dh_strip index 070f9ead..47643fd5 100755 --- a/dh_strip +++ b/dh_strip @@ -379,6 +379,7 @@ sub process_packages { install_dir("$debugtmp/usr/lib/debug/.dwz"); xargs(\@files, 'cp', '--reflink=auto', "-a", XARGS_INSERT_PARAMS_HERE, "$debugtmp/usr/lib/debug/.dwz"); doit('rm', '-fr', "$tmp/usr/lib/debug/.dwz"); + doit('rmdir', '-p', '--ignore-fail-on-non-empty', "$tmp/usr/lib/debug"); } if ($no_auto_dbgsym and $use_build_id > 1) { -- cgit v1.2.3 From b7348f222329db9ad9a8f669850c02572d2e9dad Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 29 Sep 2018 07:36:54 +0000 Subject: d/changelog: Document Josh's typo fixes Signed-off-by: Niels Thykier --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7b4883ec..241fc5a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ debhelper (11.4.1) UNRELEASED; urgency=medium * debhelper.pod: Document that we do not provide debhelper-compat for experimental/beta versions of compat levels. (Closes: #908907) + * doc/PROGRAMMING: Fix typos. -- Niels Thykier Sun, 16 Sep 2018 06:56:12 +0000 -- cgit v1.2.3 From 72ed1d3261730d56da6afde0ec7f52f32976e04d Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 29 Sep 2018 07:47:03 +0000 Subject: dh: Disable cli-options NOOP PROMISE optimization with long options Signed-off-by: Niels Thykier --- debian/changelog | 6 ++++++ dh | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 241fc5a8..9b9ff817 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,12 @@ debhelper (11.4.1) UNRELEASED; urgency=medium * dh_strip: Remove empty /usr/lib/debug directories left over by dh_dwz. Thanks to Ferenc Wágner for reporting the issue. (Closes: #909303) + * dh: Disable optimization to skip tools based on command-line + parameters when dh is passed long options. Since debhelper + had implicit support for auto-abbrevation of long options + and people have started to rely on it, the optimization in + debhelper/11.4 caused regressions. The optimization is + still enabled for short options. (Closes: #909704) [ Josh Triplett ] * debhelper.pod: Document how to declare the debhelper compat diff --git a/dh b/dh index 9b158ead..0fea4422 100755 --- a/dh +++ b/dh @@ -644,7 +644,7 @@ my %completed_sequences; # Get the options to pass to commands in the sequence. # Filter out options intended only for this program. my (@options, %seen_options); -my $unoptimizable_user_option = 0; +my ($unoptimizable_user_option, $long_options_seen) = (0, 0); if ($sequence eq 'build-arch' || $sequence eq 'install-arch' || @@ -687,6 +687,7 @@ while (@ARGV_orig) { } if ($opt =~ m/^(--[^=]++)(?:=.*)?$/ or $opt =~ m/^(-[^-])$/) { my $optname = $1; + $long_options_seen = 1 if length($optname) > 2; $seen_options{$optname} = 1; } else { $unoptimizable_user_option = 1; @@ -1069,6 +1070,10 @@ sub can_skip { return 0 if pkgfile($pkgs, $need) ne ''; } elsif ($type eq 'cli-options') { $had_cli_options = 1; + # Long options are subject to abbreviations so it is + # very difficult to implement this optimization with + # long options. + return 0 if $long_options_seen; $need =~ s/(?:^|\s)BUILDSYSTEM(?:\s|$)/${\UNSKIPPABLE_CLI_OPTIONS_BUILD_SYSTEM}/; my @behavior_options = split(qr/\Q|\E/, $need); for my $opt (@behavior_options) { -- cgit v1.2.3 From a69dfe2854a4ba25008fb4d17db561ad33034b8d Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 30 Sep 2018 15:50:02 +0000 Subject: Release debhelper/11.4.1 into unstable Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9b9ff817..6b3e3605 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (11.4.1) UNRELEASED; urgency=medium +debhelper (11.4.1) unstable; urgency=medium [ Niels Thykier ] * debhelper.pod: Quote the value of INSTALL in description of @@ -24,7 +24,7 @@ debhelper (11.4.1) UNRELEASED; urgency=medium (Closes: #908907) * doc/PROGRAMMING: Fix typos. - -- Niels Thykier Sun, 16 Sep 2018 06:56:12 +0000 + -- Niels Thykier Sun, 30 Sep 2018 15:49:38 +0000 debhelper (11.4) unstable; urgency=medium -- cgit v1.2.3 From 9076fc79b27a7b7aa5f8a1e3b1e0f54a781aefba Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Tue, 12 Jun 2018 19:47:20 -0600 Subject: dh_installsystemduser: New helper to handle systemd user instance units Add a new 'dh_installsystemduser' helper responsible for istalling package maintainer supplied systemd user instance units and to produce postinst and postrm maintiner scripts code blocks to appropriately enable, mask and disable units when the package is installed, upgraded, or removed. --- autoscripts/postinst-systemd-user-dont-enable | 15 ++ autoscripts/postinst-systemd-user-enable | 15 ++ autoscripts/postrm-systemd-user | 12 ++ debhelper.pod | 5 + debian/changelog | 11 + dh | 19 +- dh_installsystemduser | 270 ++++++++++++++++++++++++ t/dh_installsystemduser/debian/baz.user.service | 8 + t/dh_installsystemduser/debian/changelog | 5 + t/dh_installsystemduser/debian/control | 10 + t/dh_installsystemduser/debian/foo.user.service | 8 + t/dh_installsystemduser/dh_installsystemduser.t | 75 +++++++ 12 files changed, 444 insertions(+), 9 deletions(-) create mode 100644 autoscripts/postinst-systemd-user-dont-enable create mode 100644 autoscripts/postinst-systemd-user-enable create mode 100644 autoscripts/postrm-systemd-user create mode 100755 dh_installsystemduser create mode 100644 t/dh_installsystemduser/debian/baz.user.service create mode 100644 t/dh_installsystemduser/debian/changelog create mode 100644 t/dh_installsystemduser/debian/control create mode 100644 t/dh_installsystemduser/debian/foo.user.service create mode 100644 t/dh_installsystemduser/dh_installsystemduser.t (limited to 'debian') diff --git a/autoscripts/postinst-systemd-user-dont-enable b/autoscripts/postinst-systemd-user-dont-enable new file mode 100644 index 00000000..0837257f --- /dev/null +++ b/autoscripts/postinst-systemd-user-dont-enable @@ -0,0 +1,15 @@ +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then + if deb-systemd-helper --user debian-installed #UNITFILE# ; then + # This will only remove masks created by d-s-h on package removal. + deb-systemd-helper --user unmask #UNITFILE# >/dev/null || true + + if deb-systemd-helper --quiet --user was-enabled #UNITFILE# ; then + # Create new symlinks, if any. + deb-systemd-helper --user enable #UNITFILE# >/dev/null || true + fi + fi + + # Update the statefile to add new symlinks (if any), which need to be cleaned + # up on purge. Also remove old symlinks. + deb-systemd-helper --user update-state #UNITFILE# >/dev/null || true +fi diff --git a/autoscripts/postinst-systemd-user-enable b/autoscripts/postinst-systemd-user-enable new file mode 100644 index 00000000..b16f61fb --- /dev/null +++ b/autoscripts/postinst-systemd-user-enable @@ -0,0 +1,15 @@ +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then + # This will only remove masks created by d-s-h on package removal. + deb-systemd-helper --user unmask #UNITFILE# >/dev/null || true + + # was-enabled defaults to true, so new installations run enable. + if deb-systemd-helper --quiet --user was-enabled #UNITFILE# ; then + # Enables the unit on first installation, creates new + # symlinks on upgrades if the unit file has changed. + deb-systemd-helper --user enable #UNITFILE# >/dev/null || true + else + # Update the statefile to add new symlinks (if any), which need to be + # cleaned up on purge. Also remove old symlinks. + deb-systemd-helper --user update-state #UNITFILE# >/dev/null || true + fi +fi diff --git a/autoscripts/postrm-systemd-user b/autoscripts/postrm-systemd-user new file mode 100644 index 00000000..bf48d1a3 --- /dev/null +++ b/autoscripts/postrm-systemd-user @@ -0,0 +1,12 @@ +if [ "$1" = "remove" ]; then + if [ -x "/usr/bin/deb-systemd-helper" ] ; then + deb-systemd-helper --user mask #UNITFILES# >/dev/null || true + fi +fi + +if [ "$1" = "purge" ]; then + if [ -x "/usr/bin/deb-systemd-helper" ] ; then + deb-systemd-helper --user purge #UNITFILES# >/dev/null || true + deb-systemd-helper --user unmask #UNITFILES# >/dev/null || true + fi +fi diff --git a/debhelper.pod b/debhelper.pod index 177d2f8f..c758a72b 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -915,6 +915,11 @@ packages and not only during the building process. Please set B to false to revert to the previous behaviour. See B for details and examples. +=item - + +B is now included in the B standard +sequence by default. + =back =back diff --git a/debian/changelog b/debian/changelog index 6b3e3605..f25e531c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +debhelper (11.5) UNRELEASED; urgency=medium + + [ Daniele Nicolodi ] + * dh_installsystemduser: New helper responsible for istalling package + maintainer supplied systemd user instance units and to produce + postinst and postrm maintiner scripts code blocks to appropriately + enable, mask and disable units when the package is installed, + upgraded, or removed. (Closes: #764678) + + -- Daniele Nicolodi Sun, 14 Oct 2018 10:13:17 -0600 + debhelper (11.4.1) unstable; urgency=medium [ Niels Thykier ] diff --git a/dh b/dh index 0fea4422..10762133 100755 --- a/dh +++ b/dh @@ -115,10 +115,10 @@ 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_auto_configure: dh_auto_configure -- --with-foo --disable-bar @@ -199,7 +199,7 @@ want it to run, by defining empty override targets for each command. #!/usr/bin/make -f %: dh $@ - + # Commands not to run: override_dh_auto_test override_dh_compress override_dh_fixperms: @@ -210,7 +210,7 @@ These will be skipped when running build-arch and binary-arch sequences. #!/usr/bin/make -f %: dh $@ - + override_dh_auto_build-indep: $(MAKE) -C docs @@ -272,7 +272,7 @@ option to ensure they only work on architecture dependent packages. =head1 DEPRECATED OPTIONS -The following options are deprecated. It's much +The following options are deprecated. It's much better to use override targets instead. They are B available in compat 10. @@ -308,7 +308,7 @@ my @ARGV_orig=@ARGV; my (@addons, @addon_requests); inhibit_log(); - + init(options => { "until=s" => \$dh{UNTIL}, "after=s" => \$dh{AFTER}, @@ -325,7 +325,7 @@ init(options => { "l" => \&list_addons, "list" => \&list_addons, }, - # Disable complaints about unknown options; they are passed on to + # Disable complaints about unknown options; they are passed on to # the debhelper commands. ignore_unknown_options => 1, # Bundling does not work well since there are unknown options. @@ -405,6 +405,7 @@ my @i = (qw{ dh_installinit }, (!compat(10) ? qw(dh_installsystemd) : qw()), + (compat(12) ? qw(dh_installsystemduser) : qw()), qw{ dh_installmenu @@ -499,7 +500,7 @@ sub remove_command { foreach my $sequence (keys %sequences) { $sequences{$sequence}=[grep { $_ ne $command } @{$sequences{$sequence}}]; } - + } sub add_command { my ($command, $sequence) = @_; @@ -864,7 +865,7 @@ foreach my $i (0..$stoppoint) { close($fd) or error("close($stamp_file) failed: $!"); next; } - + # Check for override targets in debian/rules, and run instead of # the usual command. (The non-arch-specific override is tried first, # for simplest semantics; mixing it with arch-specific overrides diff --git a/dh_installsystemduser b/dh_installsystemduser new file mode 100755 index 00000000..bc1d0368 --- /dev/null +++ b/dh_installsystemduser @@ -0,0 +1,270 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_installsystemduser - install systemd unit files + +=cut + +use strict; +use warnings; +use Debian::Debhelper::Dh_Lib; + +our $VERSION = DH_BUILTIN_VERSION; + +=head1 SYNOPSIS + +B [S>] [B<--no-enable>] [B<--name=>I] [S ...>] + +=head1 DESCRIPTION + +B finds the systemd user instance service files +installed by a package and generates F, and F code +blocks for enabling and disabling the corresponding systemd user +instance services, when the package is installed, updated, or +removed. These snippets are added to the maintainer scripts by +L. + +L is used to enable and disable the systemd +units, thus it is not necessary that the machine actually runs systemd +during package installation time, enabling happens on all machines. + +B operates on all user instance unit files +installed by a package. For only generating blocks for specific unit +files, pass them as arguments. Specific unit files can be excluded +from processing using the B<-X> common L option. + +=head1 FILES + +=over 4 + +=item debian/I.user.path, + debian/I@.user.path, + debian/I.user.service, + debian/I@.user.service, + debian/I.user.socket, + debian/I@.user.socket, + debian/I.user.target, + debian/I@.user.target, + debian/I.user.timer, + debian/I@.user.timer + +If any of those files exists, they are installed into +F in the package build directory removing the +F<.user> file name part. + +=back + +=head1 OPTIONS + +=over 4 + +=item B<--name=>I + +Install the service file as I instead of the default +filename I. When this parameter is used, +B looks for and installs files named +F instead of the usual +F. Moreover, maintainer scripts are only +generated for units that match the given I. + +=item B<--no-enable> + +Disable the service(s) on purge, but do not enable them on install. + +=back + +=head1 NOTES + +This command is not idempotent. L should be called between +invocations of this command (with the same arguments). Otherwise, it +may cause multiple instances of the same text to be added to +maintainer scripts. + +=cut + +# PROMISE: DH NOOP WITHOUT tmp(usr/lib/systemd/user) user.service + +init(options => { + "no-enable" => \$dh{NO_ENABLE}, +}); + +sub quote { + # Add single quotes around the argument. + return '\'' . $_[0] . '\''; +} + +sub uniq { + my %seen; + return grep { !$seen{$_}++ } @_; +} + +sub contains_install_section { + my ($unit_path) = @_; + + open(my $fh, '<', $unit_path) or error("Cannot open($unit_path) to check for [Install]: $!"); + + while (my $line = <$fh>) { + chomp($line); + return 1 if $line =~ /^\s*\[Install\]$/i; + } + close($fh); + return 0; +} + +sub install_user_unit { + my ($package, $name, $suffix) = @_; + + my $tmpdir = tmpdir($package); + my $path = "$tmpdir/usr/lib/systemd/user"; + my $unit = pkgfile($package, "user.$suffix"); + return if $unit eq ''; + + install_dir($path); + install_file($unit, "$path/$name.$suffix"); +} + +# Extracts the directive values from a unit file. Handles repeated +# directives in the same unit file. Assumes values can only be +# composed of lists of unit names. This is good enough for the 'Also=' +# and 'Alias=' directives handled here. +sub extract_key { + my ($unit_path, $key) = @_; + my @values; + + open(my $fh, '<', $unit_path) or error("Cannot open($unit_path): $!"); + + while (my $line = <$fh>) { + chomp($line); + + # Since unit names can't have whitespace in systemd, simply + # use split and strip any leading/trailing quotes. See + # systemd-escape(1) for examples of valid unit names. + if ($line =~ /^\s*$key=(.+)$/i) { + for my $value (split(/\s+/, $1)) { + $value =~ s/^(["'])(.*)\g1$/$2/; + push @values, $value; + } + } + } + + close($fh); + return @values; +} + +sub list_installed_user_units { + my ($tmpdir, $aliases) = @_; + + my $lib_systemd_user = "$tmpdir/usr/lib/systemd/user"; + my @installed; + + return unless -d $lib_systemd_user; + opendir(my $dh, $lib_systemd_user) or error("Cannot opendir($lib_systemd_user): $!"); + + foreach my $name (readdir($dh)) { + my $path = "$lib_systemd_user/$name"; + next unless -f $path; + if (-l $path) { + my $dest = basename(readlink($path)); + $aliases->{$dest} //= [ ]; + push @{$aliases->{$dest}}, $name; + } else { + push @installed, $name; + } + } + + closedir($dh); + return @installed; +} + +# Install package maintainer provided unit files. +foreach my $package (@{$dh{DOPACKAGES}}) { + my $tmpdir = tmpdir($package); + + # unit file name + my $name = $dh{NAME} // $package; + + for my $type (qw(service target socket path timer)) { + install_user_unit($package, $name, $type); + install_user_unit("${package}@", "${name}@", $type); + } +} + +# Generate postinst and prerm code blocks to enable and disable units +foreach my $package (@{$dh{DOPACKAGES}}) { + my (@args, @enable_units, %aliases); + + my $tmpdir = tmpdir($package); + my @units = list_installed_user_units($tmpdir, \%aliases); + + # Handle either only the unit files which were passed as arguments + # or all unit files that are installed in this package. + if (@ARGV) { + @args = @ARGV; + } + elsif ($dh{NAME}) { + # Treat --name flag as if the corresponding units were passed + # in the command line. + @args = grep /(^|\/)$dh{NAME}\.(service|target|socket|path|timer)$/, @units; + } + else { + @args = @units; + } + + # Support excluding units via the -X debhelper common option. + foreach my $x (@{$dh{EXCLUDE}}) { + @args = grep !/(^|\/)$x$/, @args; + } + + # This hash prevents us from looping forever in the following + # while loop. An actual real-world example of such a loop is + # systemd's systemd-readahead-drop.service, which contains + # Also=systemd-readahead-collect.service, and that file in turn + # contains Also=systemd-readahead-drop.service, thus forming an + # endless loop. + my %seen; + + # Must use while and shift because the loop alters the list. + while (@args) { + my $name = shift @args; + my $path = "${tmpdir}/usr/lib/systemd/user/${name}"; + + error("User unit file \"$name\" not found in package \"$package\".") if ! -f $path; + + # Skip template service files. Enabling or disabling those + # services without specifying the instance is not useful. + next if ($name =~ /\@/); + + # Handle all unit files specified via Also= explicitly. This + # is not necessary for enabling, but for disabling, as we + # cannot read the unit file when disabling as it has already + # been deleted. + push @args, $_ for grep { !$seen{$_}++ } extract_key($path, 'Also'); + + push @enable_units, $name if contains_install_section($path); + } + + @enable_units = map { quote($_) } sort uniq @enable_units; + + if (@enable_units) { + # The generated maintainer script code blocks use the --user + # option that was added to deb-systemd-helper in version 1.52. + addsubstvar($package, 'misc:Depends', 'init-system-helpers', ">= 1.52"); + + my $postinst = $dh{NO_ENABLE} ? 'postinst-systemd-user-dont-enable' : 'postinst-systemd-user-enable'; + foreach my $unit (@enable_units) { + autoscript($package, 'postinst', $postinst, { 'UNITFILE' => $unit }); + } + autoscript($package, 'postrm', 'postrm-systemd-user', { 'UNITFILES' => join(' ', @enable_units) }); + } +} + +=head1 SEE ALSO + +L, L, L + +=head1 AUTHORS + +pkg-systemd-maintainers@lists.alioth.debian.org + +=cut diff --git a/t/dh_installsystemduser/debian/baz.user.service b/t/dh_installsystemduser/debian/baz.user.service new file mode 100644 index 00000000..3af041de --- /dev/null +++ b/t/dh_installsystemduser/debian/baz.user.service @@ -0,0 +1,8 @@ +[Unit] +Description=Baz User Unit + +[Service] +ExecStart=/bin/true + +[Install] +WantedBy=default.target diff --git a/t/dh_installsystemduser/debian/changelog b/t/dh_installsystemduser/debian/changelog new file mode 100644 index 00000000..5850f0e2 --- /dev/null +++ b/t/dh_installsystemduser/debian/changelog @@ -0,0 +1,5 @@ +foo (1.0-1) unstable; urgency=low + + * Initial release. (Closes: #XXXXXX) + + -- Test Mon, 11 Jul 2016 18:10:59 +0200 diff --git a/t/dh_installsystemduser/debian/control b/t/dh_installsystemduser/debian/control new file mode 100644 index 00000000..adccbc63 --- /dev/null +++ b/t/dh_installsystemduser/debian/control @@ -0,0 +1,10 @@ +Source: foo +Section: misc +Priority: optional +Maintainer: Test +Standards-Version: 3.9.8 + +Package: foo +Architecture: all +Description: package foo + Package foo diff --git a/t/dh_installsystemduser/debian/foo.user.service b/t/dh_installsystemduser/debian/foo.user.service new file mode 100644 index 00000000..7ef597d4 --- /dev/null +++ b/t/dh_installsystemduser/debian/foo.user.service @@ -0,0 +1,8 @@ +[Unit] +Description=Foo User Unit + +[Service] +ExecStart=/bin/true + +[Install] +WantedBy=default.target diff --git a/t/dh_installsystemduser/dh_installsystemduser.t b/t/dh_installsystemduser/dh_installsystemduser.t new file mode 100644 index 00000000..894eeb7a --- /dev/null +++ b/t/dh_installsystemduser/dh_installsystemduser.t @@ -0,0 +1,75 @@ +#!/usr/bin/perl +use strict; +use Test::More; +use File::Path qw(make_path); +use File::Basename qw(dirname); +use lib dirname(dirname(__FILE__)); +use Test::DH; +use Debian::Debhelper::Dh_Lib qw(!dirname); + +plan(tests => 1); + +our @TEST_DH_EXTRA_TEMPLATE_FILES = (qw( + debian/changelog + debian/control + debian/foo.user.service + debian/baz.user.service +)); + + +sub read_script { + my ($package, $name) = @_; + my @lines; + + foreach my $script (find_script($package, $name)) { + open(my $fh, '<', $script) or die("open($script): $!"); + push @lines, $_ for <$fh>; + close($fh); + } + + return @lines; +} + +sub _unit_check_user_enabled { + my ($package, $unit, $enabled) = @_; + my $verb = $enabled ? "is" : "isnt"; + my $matches; + + my @postinst = read_script($package, 'postinst'); + # Match exactly one tab character. The "dont-enable" script has + # an "enable" line for re-enabling the service if the admin had it + # enabled, but we do not want to include that in our count. + $matches = grep { m{^\tif deb-systemd-helper( --\w+)* --user was-enabled.*'\Q$unit'} } @postinst; + is($matches, $enabled, "$unit $verb enabled"); + + my @postrm = read_script($package, 'postrm'); + $matches = grep { m{deb-systemd-helper( --\w+)* --user mask.*'\Q$unit'} } @postrm; + is($matches, $enabled, "$unit $verb masked"); +} + +sub is_enabled { _unit_check_user_enabled(@_, 1); } +sub isnt_enabled { _unit_check_user_enabled(@_, 0); } + +each_compat_subtest { + make_path('debian/foo/usr/lib/systemd/user/'); + install_file('debian/foo.user.service', 'debian/foo/usr/lib/systemd/user/bar.service'); + ok(run_dh_tool('dh_installsystemduser')); + ok(-e 'debian/foo/usr/lib/systemd/user/foo.service'); + is_enabled('foo', 'foo.service'); + is_enabled('foo', 'bar.service'); + ok(run_dh_tool('dh_clean')); + + ok(run_dh_tool('dh_installsystemduser')); + ok(-e 'debian/foo/usr/lib/systemd/user/foo.service'); + ok(! -e 'debian/foo/usr/lib/systemd/user/baz.service'); + is_enabled('foo', 'foo.service'); + isnt_enabled('foo', 'baz.service'); + ok(run_dh_tool('dh_clean')); + + ok(run_dh_tool('dh_installsystemduser', '--name', 'baz')); + ok(! -e 'debian/foo/usr/lib/systemd/user/foo.service'); + ok(-e 'debian/foo/usr/lib/systemd/user/baz.service'); + isnt_enabled('foo', 'foo.service'); + is_enabled('foo', 'baz.service'); + ok(run_dh_tool('dh_clean')); +}; -- cgit v1.2.3 From c4a06ca230ad87da093da8c8cfd68bdb41b0ccdf Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 28 Oct 2018 14:59:12 +0000 Subject: dh_installsystemd.1: Improve docs about --name Signed-off-by: Niels Thykier --- debian/changelog | 6 ++++++ dh_installsystemd | 28 ++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f25e531c..043a94a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,12 @@ debhelper (11.5) UNRELEASED; urgency=medium enable, mask and disable units when the package is installed, upgraded, or removed. (Closes: #764678) + [ Niels Thykier ] + * dh_installsystemd.1: Improve the documentation for --name to make + it more clear that it also changes the name of the source files in + the debian directory. Thanks to Emel Hasdal for reporting the + issue and reviewing the change. (Closes: #899983) + -- Daniele Nicolodi Sun, 14 Oct 2018 10:13:17 -0600 debhelper (11.4.1) unstable; urgency=medium diff --git a/dh_installsystemd b/dh_installsystemd index d052037e..d1ba5708 100755 --- a/dh_installsystemd +++ b/dh_installsystemd @@ -82,12 +82,19 @@ should not be started. =item B<--name=>I -Install the service file as I instead of the default -filename I. When this parameter is used, -B looks for and installs files named -F instead of the usual -F. Moreover, maintainer scripts are only -generated for units that match the given I. +This option controls several things. + +It changes the name that B uses when it looks for +maintainer provided systemd unit files as listed in the L +section. As an example, B will look for +F<<< IB<< I >>I<.service> >>> instead of +F<< I >>). These unit files are installed as F<< +I >> (in the example, it would be installed as +F<<< B<< I >>I<.service> >>>). + +Furthermore, if no unit files are passed explicitly as command line +arguments, B will only act on unit files called +I (rather than all unit files found in the package). =item B<--restart-after-upgrade> @@ -122,6 +129,15 @@ B that this option does not affect whether the services are enabled. Please remember to also use B<--no-enable> if the services should not be enabled. +=item S ...> + +Only process and generate maintscripts for the installed unit files +with the (base)name I. + +Note: B will still install unit files from +F but it will not generate any maintscripts for them unless +they are explicitly listed in S ...> + =back =head1 NOTES -- cgit v1.2.3 From 926deeafdd69a46a7e765be2324735767c4e484c Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 28 Oct 2018 16:07:16 +0000 Subject: Release debhelper/11.5 into unstable Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 043a94a8..76bd8be8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (11.5) UNRELEASED; urgency=medium +debhelper (11.5) unstable; urgency=medium [ Daniele Nicolodi ] * dh_installsystemduser: New helper responsible for istalling package @@ -13,7 +13,7 @@ debhelper (11.5) UNRELEASED; urgency=medium the debian directory. Thanks to Emel Hasdal for reporting the issue and reviewing the change. (Closes: #899983) - -- Daniele Nicolodi Sun, 14 Oct 2018 10:13:17 -0600 + -- Niels Thykier Sun, 28 Oct 2018 16:07:01 +0000 debhelper (11.4.1) unstable; urgency=medium -- cgit v1.2.3 From da5b157fc1bbc4b42bf074eff47f1113621eae41 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Wed, 31 Oct 2018 21:01:55 +0000 Subject: dh_systemd_enable: Add missing substitution of RESTART_ACTION token Signed-off-by: Niels Thykier --- debian/changelog | 11 +++++++++++ dh_systemd_start | 19 +++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 76bd8be8..c772f15d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +debhelper (11.5.1) UNRELEASED; urgency=medium + + * dh_systemd_start: Fix bug introduced in debhelper/11.5 where + dh_systemd_start would fail to substitute a token in the + generated maintscript for maintainer scripts when using + "--restart-after-upgrade" (including when the option is + on by default). Thanks to Colin Watson for reporting the + bug. (Closes: #912420) + + -- Niels Thykier Wed, 31 Oct 2018 20:58:42 +0000 + debhelper (11.5) unstable; urgency=medium [ Daniele Nicolodi ] diff --git a/dh_systemd_start b/dh_systemd_start index 7f824be9..af988097 100755 --- a/dh_systemd_start +++ b/dh_systemd_start @@ -232,13 +232,24 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # The $package and $sed parameters are always the same. # This wrapper function makes the following logic easier to read. my $sd_autoscript = sub { - my ($script, $filename) = @_; - autoscript($package, $script, $filename, { 'UNITFILES' => $unitargs }); + my ($script, $filename, $restart_action) = @_; + my $replace = { + 'UNITFILES' => $unitargs, + 'RESTART_ACTION' => $restart_action // '', + }; + autoscript($package, $script, $filename, $replace); }; if ($dh{RESTART_AFTER_UPGRADE}) { - my $snippet = "postinst-systemd-restart" . ($dh{NO_START} ? "nostart" : ""); - $sd_autoscript->("postinst", $snippet); + my ($snippet, $restart_action); + if ($dh{NO_START}) { + $snippet = 'postinst-systemd-restartnostart'; + $restart_action = 'try-restart'; + } else { + $snippet = 'postinst-systemd-restart'; + $restart_action = 'restart'; + } + $sd_autoscript->("postinst", $snippet, $restart_action); } elsif (!$dh{NO_START}) { # We need to stop/start before/after the upgrade. $sd_autoscript->("postinst", "postinst-systemd-start"); -- cgit v1.2.3 From 508b3158d7bdabb5f7c2263d56de935a2a42cce6 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Wed, 31 Oct 2018 21:07:44 +0000 Subject: Release debhelper/11.5.1 into unstable Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c772f15d..fbbb8e1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (11.5.1) UNRELEASED; urgency=medium +debhelper (11.5.1) unstable; urgency=medium * dh_systemd_start: Fix bug introduced in debhelper/11.5 where dh_systemd_start would fail to substitute a token in the @@ -7,7 +7,7 @@ debhelper (11.5.1) UNRELEASED; urgency=medium on by default). Thanks to Colin Watson for reporting the bug. (Closes: #912420) - -- Niels Thykier Wed, 31 Oct 2018 20:58:42 +0000 + -- Niels Thykier Wed, 31 Oct 2018 21:02:00 +0000 debhelper (11.5) unstable; urgency=medium -- cgit v1.2.3 From 25870d6bb9a63cc7a092c92f63d549ecf27e3ff8 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 3 Nov 2018 08:03:24 +0000 Subject: d/changelog: Document Luca Boccassi change to makefile.pm --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fbbb8e1c..f98f4e1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (11.5.2) UNRELEASED; urgency=medium + + [ Luca Boccassi ] + * makefile.pm: Pass V=0 or V=1 to the make file depending on + whether "terse" is set in DEB_BUILD_OPTIONS. + + -- Niels Thykier Sat, 03 Nov 2018 08:02:02 +0000 + debhelper (11.5.1) unstable; urgency=medium * dh_systemd_start: Fix bug introduced in debhelper/11.5 where -- cgit v1.2.3 From 2c411249f911e903a20a73884fe0fc6d1e1767a3 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 3 Nov 2018 08:07:26 +0000 Subject: dh_gconf: Mark tool as deprecated Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_gconf | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f98f4e1e..b249f5be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ debhelper (11.5.2) UNRELEASED; urgency=medium * makefile.pm: Pass V=0 or V=1 to the make file depending on whether "terse" is set in DEB_BUILD_OPTIONS. + [ Niels Thykier ] + * dh_gconf: Mark dh_gconf as deprecated (see #908845). + -- Niels Thykier Sat, 03 Nov 2018 08:02:02 +0000 debhelper (11.5.1) unstable; urgency=medium diff --git a/dh_gconf b/dh_gconf index 23ca96c7..619ccb73 100755 --- a/dh_gconf +++ b/dh_gconf @@ -2,7 +2,7 @@ =head1 NAME -dh_gconf - install GConf defaults files and register schemas +dh_gconf - install GConf defaults files and register schemas (deprecated) =cut @@ -58,6 +58,8 @@ init(options => { "priority=s" => \$dh{PRIORITY}, }); +warning("Please migrate to dh_installgsettings; gconf + dh_gconf is scheduled for removal."); + my $priority=10; if (defined $dh{PRIORITY}) { $priority=$dh{PRIORITY}; -- cgit v1.2.3 From d757e39dc5a6add65539cb10b8b4dda66ce52fb1 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 4 Nov 2018 08:11:09 +0000 Subject: Dh_Lib: Add a LOWEST_VIRTUAL_DEBHELPER_COMPAT_LEVEL constant Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ debian/gen-provides | 2 +- lib/Debian/Debhelper/Dh_Lib.pm | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b249f5be..2f771d41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ debhelper (11.5.2) UNRELEASED; urgency=medium [ Niels Thykier ] * dh_gconf: Mark dh_gconf as deprecated (see #908845). + * Dh_Lib.pm: Separate lowest non-deprecated compat level and + the lowest compat level we generate "debhelper-compat (= X)" + relations for. -- Niels Thykier Sat, 03 Nov 2018 08:02:02 +0000 diff --git a/debian/gen-provides b/debian/gen-provides index 5efd5a98..f9a14bc2 100644 --- a/debian/gen-provides +++ b/debian/gen-provides @@ -9,7 +9,7 @@ my @provides; my $version = $Debian::Debhelper::Dh_Version::version; $version =~ s/~.*//; # Drop backports marker $version =~ s/^\d+\K\..*//; -for (my $i = Debian::Debhelper::Dh_Lib::LOWEST_NON_DEPRECATED_COMPAT_LEVEL ; $i <= $version ; $i++) { +for (my $i = Debian::Debhelper::Dh_Lib::LOWEST_VIRTUAL_DEBHELPER_COMPAT_LEVEL ; $i <= $version ; $i++) { push(@provides, "debhelper-compat (= $i)"); } print "dh:CompatLevels=" . join(", ", @provides) . "\n"; diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm index 9359eb27..98b60413 100644 --- a/lib/Debian/Debhelper/Dh_Lib.pm +++ b/lib/Debian/Debhelper/Dh_Lib.pm @@ -15,6 +15,9 @@ use constant { # Lowest compat level that does *not* cause deprecation # warnings 'LOWEST_NON_DEPRECATED_COMPAT_LEVEL' => 9, + # Lowest compat level to generate "debhelper-compat (= X)" + # relations for. + 'LOWEST_VIRTUAL_DEBHELPER_COMPAT_LEVEL' => 9, # Highest compat level permitted 'MAX_COMPAT_LEVEL' => 12, # Magic value for xargs -- cgit v1.2.3 From 3ffb5e127c8fa0f3d3f9f08c8e4e62151e85fd1f Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 4 Nov 2018 08:13:31 +0000 Subject: Dh_Lib: Accept compat level 13 Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ lib/Debian/Debhelper/Dh_Lib.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2f771d41..f27d0cd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ debhelper (11.5.2) UNRELEASED; urgency=medium * Dh_Lib.pm: Separate lowest non-deprecated compat level and the lowest compat level we generate "debhelper-compat (= X)" relations for. + * Dh_Lib.pm: Open compat level 13 as an experimental compat + level. -- Niels Thykier Sat, 03 Nov 2018 08:02:02 +0000 diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm index 98b60413..aa7448bc 100644 --- a/lib/Debian/Debhelper/Dh_Lib.pm +++ b/lib/Debian/Debhelper/Dh_Lib.pm @@ -19,7 +19,7 @@ use constant { # relations for. 'LOWEST_VIRTUAL_DEBHELPER_COMPAT_LEVEL' => 9, # Highest compat level permitted - 'MAX_COMPAT_LEVEL' => 12, + 'MAX_COMPAT_LEVEL' => 13, # Magic value for xargs 'XARGS_INSERT_PARAMS_HERE' => \'', #'# Hi emacs. # Magic value for debhelper tools to request "current version" -- cgit v1.2.3 From 05d5284eec0a1f04732159e9fc6e83ecb0e0f505 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 4 Nov 2018 08:25:36 +0000 Subject: meson: Run tests with meson [c13] Signed-off-by: Niels Thykier --- debhelper.pod | 18 ++++++++++++++++++ debian/changelog | 3 +++ lib/Debian/Debhelper/Buildsystem/meson.pm | 24 ++++++++++++++++++++++++ 3 files changed, 45 insertions(+) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index c758a72b..0b0baefe 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -922,6 +922,24 @@ sequence by default. =back +=item v13 + +This compatibility level is still open for development; use with caution. + +Changes from v12 are: + +=over 8 + +=item - + +The B build system now uses B instead of +B when running the test suite. Any override of +B that passes extra parameters to upstream test runner +should be reviewed as B is not command line compatible +with B. + +=back + =back =head1 NOTES diff --git a/debian/changelog b/debian/changelog index f27d0cd0..8e92b326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ debhelper (11.5.2) UNRELEASED; urgency=medium relations for. * Dh_Lib.pm: Open compat level 13 as an experimental compat level. + * meson.pm: In compat 13, run tests with "meson test" rather + than "ninja test". Thanks to Simon McVittie for the + suggestion. (Closes: #912560) -- Niels Thykier Sat, 03 Nov 2018 08:02:02 +0000 diff --git a/lib/Debian/Debhelper/Buildsystem/meson.pm b/lib/Debian/Debhelper/Buildsystem/meson.pm index a90fb703..316fe34b 100644 --- a/lib/Debian/Debhelper/Buildsystem/meson.pm +++ b/lib/Debian/Debhelper/Buildsystem/meson.pm @@ -104,4 +104,28 @@ sub configure { } } +sub test { + my $this = shift; + my $target = $this->get_targetbuildsystem; + + if (compat(12) or $target->name ne 'ninja') { + $target->test(@_); + } else { + # In compat 13 with meson+ninja, we prefer using "meson test" + # over "ninja test" + my %options = ( + update_env => { + 'LC_ALL' => 'C.UTF-8', + } + ); + if ($this->get_parallel() > 0) { + $options{update_env}{MESON_TESTTHREADS} = $this->get_parallel(); + } + $this->doit_in_builddir(\%options, $this->{buildcmd}, "test", @_); + } + return 1; +} + + + 1 -- cgit v1.2.3 From 9fdf901c045012469c1e63e1e4da82499ddedcd2 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 9 Nov 2018 18:24:03 +0000 Subject: dh: Fix inverted boolean logic Signed-off-by: Niels Thykier --- debian/changelog | 5 +++++ dh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8e92b326..1a9cbd16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,11 @@ debhelper (11.5.2) UNRELEASED; urgency=medium * meson.pm: In compat 13, run tests with "meson test" rather than "ninja test". Thanks to Simon McVittie for the suggestion. (Closes: #912560) + * dh: Correctly include dh_installsystemduser in the sequence + in compat 12. It was excluded due to an inverted boolean + meaning it was added in compat up to (and incl.) compat 11. + Thanks to Michael Biebl for reporting the issue. + (Closes: #913329) -- Niels Thykier Sat, 03 Nov 2018 08:02:02 +0000 diff --git a/dh b/dh index 10762133..a1a4122b 100755 --- a/dh +++ b/dh @@ -405,7 +405,7 @@ my @i = (qw{ dh_installinit }, (!compat(10) ? qw(dh_installsystemd) : qw()), - (compat(12) ? qw(dh_installsystemduser) : qw()), + (!compat(11) ? qw(dh_installsystemduser) : qw()), qw{ dh_installmenu -- cgit v1.2.3 From 44a643a97edf3cd5ef7dbc592b9ea1a73bf0af29 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 10 Nov 2018 17:12:56 +0000 Subject: fr.po: Correct the French translation for dh_installman Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ man/po4a/po/fr.po | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1a9cbd16..36418f60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,10 @@ debhelper (11.5.2) UNRELEASED; urgency=medium meaning it was added in compat up to (and incl.) compat 11. Thanks to Michael Biebl for reporting the issue. (Closes: #913329) + * fr.po: Correct translations for dh_installman.1 which + incorrectly implied that dh_installman was deprecated. + Thanks to Laurent Bigonville for reporting the issue. + (Closes: #912978) -- Niels Thykier Sat, 03 Nov 2018 08:02:02 +0000 diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po index 8be3e3c2..491956e9 100644 --- a/man/po4a/po/fr.po +++ b/man/po4a/po/fr.po @@ -7948,7 +7948,7 @@ msgid "" "B is a debhelper program that handles installing man pages " "into the correct locations in package build directories." msgstr "" -"B est l'ancien programme de la suite debhelper chargé de " +"B est un programme de la suite debhelper chargé de " "l'installation automatique des pages de manuel au bon endroit dans le " "répertoire de construction du paquet." -- cgit v1.2.3 From 2a1594ab698353d2bc36f88dd7af05c167e86de3 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 10 Nov 2018 19:15:19 +0000 Subject: cmake: Pass QMAKE_EXECUTABLE when cross-building Signed-off-by: Niels Thykier --- debian/changelog | 5 +++++ lib/Debian/Debhelper/Buildsystem/cmake.pm | 1 + 2 files changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 36418f60..2beda1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,11 @@ debhelper (11.5.2) UNRELEASED; urgency=medium Thanks to Laurent Bigonville for reporting the issue. (Closes: #912978) + [ Helmut Grohne ] + * cmake.pm: Pass QMAKE_EXECUTABLE when cross-building. + (Closes: #913415) + + -- Niels Thykier Sat, 03 Nov 2018 08:02:02 +0000 debhelper (11.5.1) unstable; urgency=medium diff --git a/lib/Debian/Debhelper/Buildsystem/cmake.pm b/lib/Debian/Debhelper/Buildsystem/cmake.pm index b2364a59..37f82c6c 100644 --- a/lib/Debian/Debhelper/Buildsystem/cmake.pm +++ b/lib/Debian/Debhelper/Buildsystem/cmake.pm @@ -110,6 +110,7 @@ sub configure { } push(@flags, "-DPKG_CONFIG_EXECUTABLE=/usr/bin/" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config"); push(@flags, "-DPKGCONFIG_EXECUTABLE=/usr/bin/" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config"); + push(@flags, "-DQMAKE_EXECUTABLE=/usr/bin/" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-qmake"); } push(@flags, "-DCMAKE_INSTALL_LIBDIR=lib/" . dpkg_architecture_value("DEB_HOST_MULTIARCH")); -- cgit v1.2.3 From 8e8aea6365b619e9f677b1a62628a70cab39c89a Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 10 Nov 2018 19:51:42 +0000 Subject: Release debhelper/11.5.2 into unstable Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2beda1fb..2478565e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (11.5.2) UNRELEASED; urgency=medium +debhelper (11.5.2) unstable; urgency=medium [ Luca Boccassi ] * makefile.pm: Pass V=0 or V=1 to the make file depending on @@ -29,7 +29,7 @@ debhelper (11.5.2) UNRELEASED; urgency=medium (Closes: #913415) - -- Niels Thykier Sat, 03 Nov 2018 08:02:02 +0000 + -- Niels Thykier Sat, 10 Nov 2018 19:51:25 +0000 debhelper (11.5.1) unstable; urgency=medium -- cgit v1.2.3 From ad9e3a97499987062404c8b5a9df38bc5fd2a243 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 10 Nov 2018 20:38:56 +0000 Subject: cmake: Pass correct CMAKE_SYSTEM_PROCESSOR for ppc64el Signed-off-by: Niels Thykier --- debian/changelog | 8 ++++++++ lib/Debian/Debhelper/Buildsystem/cmake.pm | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2478565e..9fe3025d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (11.5.3) UNRELEASED; urgency=medium + + [ Helmut Grohne ] + * cmake.pm: Pass the usual CMAKE_SYSTEM_PROCESSOR for ppc64el + when cross compiling. (Closes: #913425) + + -- Niels Thykier Sat, 10 Nov 2018 20:36:59 +0000 + debhelper (11.5.2) unstable; urgency=medium [ Luca Boccassi ] diff --git a/lib/Debian/Debhelper/Buildsystem/cmake.pm b/lib/Debian/Debhelper/Buildsystem/cmake.pm index 37f82c6c..ee8abb26 100644 --- a/lib/Debian/Debhelper/Buildsystem/cmake.pm +++ b/lib/Debian/Debhelper/Buildsystem/cmake.pm @@ -26,6 +26,10 @@ my %DEB_HOST2CMAKE_SYSTEM = ( 'hurd' => 'GNU', ); +my %GNU_CPU2SYSTEM_PROCESSOR = ( + 'powerpc64le' => 'ppc64le', +); + my %TARGET_BUILD_SYSTEM2CMAKE_GENERATOR = ( 'makefile' => 'Unix Makefiles', 'ninja' => 'Ninja', @@ -101,7 +105,12 @@ sub configure { } else { error("Cannot cross-compile - CMAKE_SYSTEM_NAME not known for ${deb_host}"); } - push @flags, "-DCMAKE_SYSTEM_PROCESSOR=" . dpkg_architecture_value("DEB_HOST_GNU_CPU"); + my $gnu_cpu = dpkg_architecture_value("DEB_HOST_GNU_CPU"); + if (exists($GNU_CPU2SYSTEM_PROCESSOR{$gnu_cpu})) { + push @flags, "-DCMAKE_SYSTEM_PROCESSOR=" . $GNU_CPU2SYSTEM_PROCESSOR{$gnu_cpu}; + } else { + push @flags, "-DCMAKE_SYSTEM_PROCESSOR=${gnu_cpu}"; + } if (not $ENV{CC}) { push @flags, "-DCMAKE_C_COMPILER=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-gcc"; } -- cgit v1.2.3 From a884723efd1b8198f228e1fe173c439494a1d7ee Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 10 Nov 2018 21:42:27 +0000 Subject: Release debhelper/11.5.3 into unstable Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9fe3025d..39517595 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -debhelper (11.5.3) UNRELEASED; urgency=medium +debhelper (11.5.3) unstable; urgency=medium [ Helmut Grohne ] * cmake.pm: Pass the usual CMAKE_SYSTEM_PROCESSOR for ppc64el when cross compiling. (Closes: #913425) - -- Niels Thykier Sat, 10 Nov 2018 20:36:59 +0000 + -- Niels Thykier Sat, 10 Nov 2018 21:42:12 +0000 debhelper (11.5.2) unstable; urgency=medium -- cgit v1.2.3 From fff0f01c4ceb910ec4d0455718a2f60e22463792 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 13 Nov 2018 20:35:30 +0000 Subject: Dh_Lib,dh_installman: Reopen stdin for reading in doit/man(1)-check This make debhelper work when run under nohup(1), which opens stdin for writing. Trivial to test with: dpkg-buildpackage [...] 0>/dev/null (Once you know that you are looking for it). Signed-off-by: Niels Thykier --- debian/changelog | 11 +++++++++++ dh_installman | 2 +- lib/Debian/Debhelper/Dh_Lib.pm | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 39517595..f69a7edc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +debhelper (11.5.4) UNRELEASED; urgency=medium + + * Dh_Lib.pm: Reopen stdin to read from /dev/null in doit (and its sibling + functions) to prevent issues when stdin is open in write-only mode + (which is what nohup(1) does). Thanks to Julian Gilbey for reporting + the issue and providing a sample patch for it as well. + (Closes: #913663) + * dh_installman: Ditto. + + -- Niels Thykier Tue, 13 Nov 2018 20:30:49 +0000 + debhelper (11.5.3) unstable; urgency=medium [ Helmut Grohne ] diff --git a/dh_installman b/dh_installman index a41d9c8e..96d6c7a5 100755 --- a/dh_installman +++ b/dh_installman @@ -272,7 +272,7 @@ on_items_in_parallel(\@all_packages, sub { }); # Now utf-8 conversion. -if (defined `man --version`) { +if (defined `man --version {stdout})) { open(STDOUT, '>', $output) or error("redirect STDOUT failed: $!"); } -- cgit v1.2.3 From f08f0bb1be5e4e93281c7121463b1b950e9e80d9 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 13 Nov 2018 20:55:33 +0000 Subject: dh_installman: Check for man(1) in PATH rather than exec'ing Signed-off-by: Niels Thykier --- debian/changelog | 4 +++- dh_installman | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f69a7edc..aa50c2d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,9 @@ debhelper (11.5.4) UNRELEASED; urgency=medium (which is what nohup(1) does). Thanks to Julian Gilbey for reporting the issue and providing a sample patch for it as well. (Closes: #913663) - * dh_installman: Ditto. + * dh_installman: Check PATH for an executable man(1) rather than trying + to run "man --version". This avoids awkward warnings when man is not + available or when stdin is open for writing rather than reading. -- Niels Thykier Tue, 13 Nov 2018 20:30:49 +0000 diff --git a/dh_installman b/dh_installman index 96d6c7a5..df13dcb4 100755 --- a/dh_installman +++ b/dh_installman @@ -272,7 +272,7 @@ on_items_in_parallel(\@all_packages, sub { }); # Now utf-8 conversion. -if (defined `man --version -- cgit v1.2.3 From 8523120dccaf5666425109da228b7e1778f15e8b Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 13 Nov 2018 21:28:13 +0000 Subject: dh_installman: Rollback to qx-based check for man Our current detections fail horriable on gitlab/salsa where there is a man(1) in PATH that triggers EPERM when being run (but a -x test in PATH does not filter it out). Signed-off-by: Niels Thykier --- debian/changelog | 3 --- dh_installman | 9 +-------- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aa50c2d9..fe5624e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,9 +5,6 @@ debhelper (11.5.4) UNRELEASED; urgency=medium (which is what nohup(1) does). Thanks to Julian Gilbey for reporting the issue and providing a sample patch for it as well. (Closes: #913663) - * dh_installman: Check PATH for an executable man(1) rather than trying - to run "man --version". This avoids awkward warnings when man is not - available or when stdin is open for writing rather than reading. -- Niels Thykier Tue, 13 Nov 2018 20:30:49 +0000 diff --git a/dh_installman b/dh_installman index df13dcb4..8adc5543 100755 --- a/dh_installman +++ b/dh_installman @@ -272,7 +272,7 @@ on_items_in_parallel(\@all_packages, sub { }); # Now utf-8 conversion. -if (has_man()) { +if (defined(`man --version`)) { my (@manpages_to_reencode, @issues); for my $package (@{$dh{DOPACKAGES}}) { next if is_udeb($package); @@ -359,13 +359,6 @@ sub find_so_man { } } -sub has_man { - for my $dir (split(':', $ENV{'PATH'})) { - return 1 if -x "${dir}/man"; - } - return 0; -} - =head1 SEE ALSO L -- cgit v1.2.3 From 88006149695cb18e3689dbe41d4276e20b2fbac3 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 2 Dec 2018 09:11:05 +0000 Subject: fr.po: Add missing dash in --parallel Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ man/po4a/po/fr.po | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fe5624e2..7dcf7145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ debhelper (11.5.4) UNRELEASED; urgency=medium (which is what nohup(1) does). Thanks to Julian Gilbey for reporting the issue and providing a sample patch for it as well. (Closes: #913663) + * fr.po: Add missing dash in "--parallel" in a translation. Thanks to + Christian Marillat for reporting the issue. (Closes: #915255) -- Niels Thykier Tue, 13 Nov 2018 20:30:49 +0000 diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po index 491956e9..9fd0b9af 100644 --- a/man/po4a/po/fr.po +++ b/man/po4a/po/fr.po @@ -796,7 +796,7 @@ msgstr "" #. type: =item #: debhelper.pod:278 msgid "B<--parallel>, B<--no-parallel>" -msgstr "B<-parallel>, B<--no-parallel>" +msgstr "B<--parallel>, B<--no-parallel>" #. type: textblock #: debhelper.pod:280 -- cgit v1.2.3 From 0d81dac9cf7b2be625b6265d55e48da1fe4eceb2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 26 Nov 2018 10:40:32 +0000 Subject: Revert "makefile.pm: pass V=1/0 depending on DH_QUIET" This reverts commit dbdc8f0188b26734031c00c8fb227208841dd531. At least one package uses V in a different way than a simple boolean-ish variable, and thus causes a build failure. As pointed out on the bug report, there is no sane way to predict what variables makefiles are going to use, and it might cause hidden issues and mis-builds rather than simple build failures. Closes: Debian#914419 Signed-off-by: Luca Boccassi --- debian/changelog | 6 ++++++ lib/Debian/Debhelper/Buildsystem/makefile.pm | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7dcf7145..e2d4d853 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ debhelper (11.5.4) UNRELEASED; urgency=medium + [ Niels Thykier ] * Dh_Lib.pm: Reopen stdin to read from /dev/null in doit (and its sibling functions) to prevent issues when stdin is open in write-only mode (which is what nohup(1) does). Thanks to Julian Gilbey for reporting @@ -8,6 +9,11 @@ debhelper (11.5.4) UNRELEASED; urgency=medium * fr.po: Add missing dash in "--parallel" in a translation. Thanks to Christian Marillat for reporting the issue. (Closes: #915255) + [ Luca Boccassi ] + * makefile.pm: revert passing V=0/1 to makefiles. Fixes FTBFS in apcupsd + (and possibly more). + (Closes: #914419) + -- Niels Thykier Tue, 13 Nov 2018 20:30:49 +0000 debhelper (11.5.3) unstable; urgency=medium diff --git a/lib/Debian/Debhelper/Buildsystem/makefile.pm b/lib/Debian/Debhelper/Buildsystem/makefile.pm index 6e661822..052af0b4 100644 --- a/lib/Debian/Debhelper/Buildsystem/makefile.pm +++ b/lib/Debian/Debhelper/Buildsystem/makefile.pm @@ -9,7 +9,7 @@ package Debian::Debhelper::Buildsystem::makefile; use strict; use warnings; use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value escape_shell clean_jobserver_makeflags is_cross_compiling compat - should_use_root gain_root_cmd %dh); + should_use_root gain_root_cmd); use parent qw(Debian::Debhelper::Buildsystem); my %DEB_DEFAULT_TOOLS = ( @@ -89,12 +89,6 @@ sub do_make { unshift(@_, '-j1'); } - if ($dh{QUIET}) { - unshift(@_, 'V=0'); - } else { - unshift(@_, 'V=1'); - } - my @root_cmd; if (exists($this->{_run_make_as_root}) and $this->{_run_make_as_root}) { @root_cmd = gain_root_cmd(); -- cgit v1.2.3 From 361e98e3edd8817bb554a678d244a91ccb2d950d Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Thu, 6 Dec 2018 20:34:27 +0000 Subject: debhelper.7: Document that python-distutils is gone [c12] Signed-off-by: Niels Thykier --- debhelper.pod | 5 +++++ debian/changelog | 3 +++ 2 files changed, 8 insertions(+) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index 0b0baefe..6ce1eb21 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -920,6 +920,11 @@ B for details and examples. B is now included in the B standard sequence by default. +=item - + +The B buildsystem is now removed. Please use the +third-party build system B instead. + =back =item v13 diff --git a/debian/changelog b/debian/changelog index e2d4d853..b0825bcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ debhelper (11.5.4) UNRELEASED; urgency=medium (Closes: #913663) * fr.po: Add missing dash in "--parallel" in a translation. Thanks to Christian Marillat for reporting the issue. (Closes: #915255) + * debhelper.7: Document that the "python-distutils" build system is + removed in compat 12. Thanks to Axel Beckert for reporting the + omission. (Closes: #915530) [ Luca Boccassi ] * makefile.pm: revert passing V=0/1 to makefiles. Fixes FTBFS in apcupsd -- cgit v1.2.3 From 0f5af370b98f2424c332e3c33d3e7198f1786c3e Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 15 Dec 2018 19:29:52 +0000 Subject: Release debhelper/11.5.4 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b0825bcf..d336886b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (11.5.4) UNRELEASED; urgency=medium +debhelper (11.5.4) unstable; urgency=medium [ Niels Thykier ] * Dh_Lib.pm: Reopen stdin to read from /dev/null in doit (and its sibling @@ -17,7 +17,7 @@ debhelper (11.5.4) UNRELEASED; urgency=medium (and possibly more). (Closes: #914419) - -- Niels Thykier Tue, 13 Nov 2018 20:30:49 +0000 + -- Niels Thykier Sat, 15 Dec 2018 19:18:47 +0000 debhelper (11.5.3) unstable; urgency=medium -- cgit v1.2.3 From 9b6173ffc264413d673dee9813e61ea140a633a2 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 16 Dec 2018 19:11:29 +0000 Subject: d/changelog: Add changelog entry for Dmitry's change Signed-off-by: Niels Thykier --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d336886b..5fae0cc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (11.5.5) UNRELEASED; urgency=medium + + [ Dmitry Shachnev ] + * dh_compress: Do not compress mkdocs search indices + (search_index.json). + + -- Niels Thykier Sun, 16 Dec 2018 19:10:51 +0000 + debhelper (11.5.4) unstable; urgency=medium [ Niels Thykier ] -- cgit v1.2.3 From 94be200dff62fdbd12479fedbe649b69e568a9fc Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 24 Dec 2018 13:01:04 +0000 Subject: Mark compat 12 as stable Signed-off-by: Niels Thykier --- debhelper.pod | 4 +--- debian/changelog | 7 +++++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index 6ce1eb21..acee4e20 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -642,8 +642,6 @@ those ~5 years, this item have been removed rather than fixed. =item v11 -This is the recommended mode of operation. - Changes from v10 are: =over 8 @@ -788,7 +786,7 @@ This change may cause the tools to process more files than previously. =item v12 -This compatibility level is open for beta testing; changes may occur. +This is the recommended mode of operation. Changes from v11 are: diff --git a/debian/changelog b/debian/changelog index 5fae0cc7..db82503a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,13 @@ -debhelper (11.5.5) UNRELEASED; urgency=medium +debhelper (12) UNRELEASED; urgency=medium + + [ Niels Thykier ] + * Release debhelper/12 marking compat 12 as stable. [ Dmitry Shachnev ] * dh_compress: Do not compress mkdocs search indices (search_index.json). - -- Niels Thykier Sun, 16 Dec 2018 19:10:51 +0000 + -- Niels Thykier Mon, 24 Dec 2018 12:50:55 +0000 debhelper (11.5.4) unstable; urgency=medium -- cgit v1.2.3 From 91eb51b3985fb6d7b4f21443aeba4228f61ca4f5 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 24 Dec 2018 13:23:18 +0000 Subject: dh: Special case cli-options() with no options Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ dh | 3 +++ 2 files changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index db82503a..92327208 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ debhelper (12) UNRELEASED; urgency=medium [ Niels Thykier ] * Release debhelper/12 marking compat 12 as stable. + * dh: Special NOOP PROMISE of cli-options() to always allow skipping + the helper (as we know no option can make it change behaviour). [ Dmitry Shachnev ] * dh_compress: Do not compress mkdocs search indices diff --git a/dh b/dh index a1a4122b..e3d3c60e 100755 --- a/dh +++ b/dh @@ -1071,6 +1071,9 @@ sub can_skip { return 0 if pkgfile($pkgs, $need) ne ''; } elsif ($type eq 'cli-options') { $had_cli_options = 1; + # If cli-options is empty, we no the helper does not + # react to any thing and can always be skipped. + next if $need =~ m/^\s*$/; # Long options are subject to abbreviations so it is # very difficult to implement this optimization with # long options. -- cgit v1.2.3 From cb9d733804494af13b6a6e468b246cf793e79188 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 24 Dec 2018 13:48:13 +0000 Subject: Release debhelper/12 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 92327208..9f8ededd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12) UNRELEASED; urgency=medium +debhelper (12) unstable; urgency=medium [ Niels Thykier ] * Release debhelper/12 marking compat 12 as stable. @@ -9,7 +9,7 @@ debhelper (12) UNRELEASED; urgency=medium * dh_compress: Do not compress mkdocs search indices (search_index.json). - -- Niels Thykier Mon, 24 Dec 2018 12:50:55 +0000 + -- Niels Thykier Mon, 24 Dec 2018 13:47:55 +0000 debhelper (11.5.4) unstable; urgency=medium -- cgit v1.2.3 From 40bd7d14e2e9c4013e44fed78b973e43e10e52b0 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Fri, 4 Jan 2019 18:29:46 +0100 Subject: dh_fixperms: add .node in mode_0644_patterns --- debian/changelog | 7 +++++++ dh_fixperms | 2 ++ 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9f8ededd..31da5e05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (12.1) UNRELEASED; urgency=medium + + [ Xavier Guimard ] + * dh_fixperms: add .node in mode_0644_patterns + + -- Niels Thykier Fri, 04 Jan 2019 18:27:58 +0100 + debhelper (12) unstable; urgency=medium [ Niels Thykier ] diff --git a/dh_fixperms b/dh_fixperms index 393381fd..bbfd8b03 100755 --- a/dh_fixperms +++ b/dh_fixperms @@ -72,6 +72,8 @@ my @mode_0644_patterns = ( '*.jpeg', '*.jpg', '*.png', '*.gif', # OCaml native-code shared objects '*.cmxs', + # Node bindings + '*.node', ); my @mode_0755_patterns = ( # None for Debian -- cgit v1.2.3 From 93b498029886e50d0e04dab81375365659c5411e Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 9 Feb 2019 10:19:11 +0000 Subject: d/changelog: Document Sylvestre Ledru's change Signed-off-by: Niels Thykier --- debian/changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 31da5e05..d7bbe0d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ debhelper (12.1) UNRELEASED; urgency=medium [ Xavier Guimard ] - * dh_fixperms: add .node in mode_0644_patterns + * dh_fixperms: add .node in mode_0644_patterns. + + [ Sylvestre Ledru ] + * dh_strip: Print a warning when an ELF binary does not have a + build-id (or when dh_strip cannot find it). -- Niels Thykier Fri, 04 Jan 2019 18:27:58 +0100 -- cgit v1.2.3 From 7d4f23e73f377606db49e3ceda4e2ece370fa679 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 9 Feb 2019 10:44:22 +0000 Subject: filedoublearray: Strip whitespace and detect whitespace-only lines Signed-off-by: Niels Thykier --- debian/changelog | 8 ++++++++ lib/Debian/Debhelper/Dh_Lib.pm | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d7bbe0d9..2db581eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,14 @@ debhelper (12.1) UNRELEASED; urgency=medium * dh_strip: Print a warning when an ELF binary does not have a build-id (or when dh_strip cannot find it). + [ Niels Thykier ] + * Dh_Lib.pm: Strip leading and trailing whitespace from lines in + regular debhelper config files. Whitespace-only lines from + executable config files are now explicitly detected and triggers + a human readable error message early rather than warnings/errors + about uninitialized variables. Thanks to Ben Finney for the + suggestion and the initial patch. (Closes: #919853) + -- Niels Thykier Fri, 04 Jan 2019 18:27:58 +0100 debhelper (12) unstable; urgency=medium diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm index 482e758e..f78f3248 100644 --- a/lib/Debian/Debhelper/Dh_Lib.pm +++ b/lib/Debian/Debhelper/Dh_Lib.pm @@ -1387,9 +1387,17 @@ sub filedoublearray { my @ret; while () { chomp; - if (not $x) { - next if /^#/ || /^$/; + if ($x) { + if (m/^\s++$/) { + error("Executable config file $file produced a non-empty whitespace-only line"); + } + } else { + s/^\s++//; + next if /^#/; + s/\s++$//; } + # We always ignore/permit empty lines + next if $_ eq ''; my @line; if (defined($globdir) && ! $x) { -- cgit v1.2.3 From c30a281d73af08266e394c08c5e3769840727121 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 9 Feb 2019 10:59:42 +0000 Subject: meson: Dump meson-logs/testlog.txt on test error Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ lib/Debian/Debhelper/Buildsystem/meson.pm | 32 +++++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2db581eb..dcc59cb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ debhelper (12.1) UNRELEASED; urgency=medium a human readable error message early rather than warnings/errors about uninitialized variables. Thanks to Ben Finney for the suggestion and the initial patch. (Closes: #919853) + * meson.pm: Dump "meson-logs/testlog.txt" if testing fails with + an error. Thanks to Jeremy Bicha for the suggestion. + (Closes: #918066) -- Niels Thykier Fri, 04 Jan 2019 18:27:58 +0100 diff --git a/lib/Debian/Debhelper/Buildsystem/meson.pm b/lib/Debian/Debhelper/Buildsystem/meson.pm index 316fe34b..e18d1112 100644 --- a/lib/Debian/Debhelper/Buildsystem/meson.pm +++ b/lib/Debian/Debhelper/Buildsystem/meson.pm @@ -108,20 +108,28 @@ sub test { my $this = shift; my $target = $this->get_targetbuildsystem; - if (compat(12) or $target->name ne 'ninja') { - $target->test(@_); - } else { - # In compat 13 with meson+ninja, we prefer using "meson test" - # over "ninja test" - my %options = ( - update_env => { - 'LC_ALL' => 'C.UTF-8', + eval { + if (compat(12) or $target->name ne 'ninja') { + $target->test(@_); + } else { + # In compat 13 with meson+ninja, we prefer using "meson test" + # over "ninja test" + my %options = ( + update_env => { + 'LC_ALL' => 'C.UTF-8', + } + ); + if ($this->get_parallel() > 0) { + $options{update_env}{MESON_TESTTHREADS} = $this->get_parallel(); } - ); - if ($this->get_parallel() > 0) { - $options{update_env}{MESON_TESTTHREADS} = $this->get_parallel(); + $this->doit_in_builddir(\%options, $this->{buildcmd}, "test", @_); + } + }; + if (my $err = $@) { + if (-e $this->get_buildpath("meson-logs/testlog.txt")) { + $this->doit_in_builddir('tail', '-v', '-n', '+0', 'meson-logs/testlog.txt'); } - $this->doit_in_builddir(\%options, $this->{buildcmd}, "test", @_); + die $err; } return 1; } -- cgit v1.2.3 From 482010776112f687b3393b3af74ef606a8ad8251 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 9 Feb 2019 15:50:46 +0000 Subject: dh_missing: Improve wording about -X/--exclude Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ dh_missing | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dcc59cb8..8899e773 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,10 @@ debhelper (12.1) UNRELEASED; urgency=medium * meson.pm: Dump "meson-logs/testlog.txt" if testing fails with an error. Thanks to Jeremy Bicha for the suggestion. (Closes: #918066) + * dh_missing: Clarify the documentation about when -X with other + helpers can may dh_missing ignore paths that are not installed. + Thanks to Hilko Bengen for reporting the original documentation + was unsufficient. (Closes: #917362) -- Niels Thykier Fri, 04 Jan 2019 18:27:58 +0100 diff --git a/dh_missing b/dh_missing index fb68ffa9..fd70ed7f 100755 --- a/dh_missing +++ b/dh_missing @@ -59,8 +59,12 @@ Wildcards without matches will be ignored. Warn on stderr about source files not installed to somewhere. -Note that files that are excluded from being moved via the B<-X> option are not -warned about. +Note that many dh-tools acting on a path will mark the path as +installed even if it has been excluded via B<-X> or B<--exclude>. +This is also seen when a dh-tool is acting on a directory and +exclusion is used to ignore some files in the directory. In either +case, this will make B silently assume the excluded files +have been handled. This is the default in compat 12 and later. -- cgit v1.2.3 From 5651ad0f231cc393af24c9474771a3e69c751fa0 Mon Sep 17 00:00:00 2001 From: Baptiste Jammet Date: Sat, 9 Feb 2019 15:52:43 +0000 Subject: Update French translation Signed-off-by: Niels Thykier --- debian/changelog | 3 + man/po4a/po/fr.po | 622 +++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 430 insertions(+), 195 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8899e773..f7831680 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,9 @@ debhelper (12.1) UNRELEASED; urgency=medium Thanks to Hilko Bengen for reporting the original documentation was unsufficient. (Closes: #917362) + [ Baptiste Jammet ] + * fr.po: Update French translation. (Closes: #921254) + -- Niels Thykier Fri, 04 Jan 2019 18:27:58 +0100 debhelper (12) unstable; urgency=medium diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po index 676e4df9..80673e58 100644 --- a/man/po4a/po/fr.po +++ b/man/po4a/po/fr.po @@ -1,12 +1,12 @@ # Translation of debhelper manpages to French # Valery Perrin , 2005, 2006, 2010, 2011. # David Prévot , 2012-2014. -# Baptiste Jammet , 2015-2017. +# Baptiste Jammet , 2015-2017, 2019. msgid "" msgstr "" "Project-Id-Version: debhelper manpages\n" "POT-Creation-Date: 2018-12-24 13:46+0000\n" -"PO-Revision-Date: 2017-12-17 17:44+0100\n" +"PO-Revision-Date: 2019-01-18 13:58+0100\n" "Last-Translator: Baptiste Jammet \n" "Language-Team: French \n" "Language: fr\n" @@ -109,7 +109,7 @@ msgstr "" "automatiser les tâches courantes liées à la construction des paquets, d'où " "un travail allégé pour le responsable. Dans une certaine mesure, cela " "signifie également que ces outils peuvent être adaptés aux modifications " -"éventuelles de la Charte Debian. Les paquets qui utiliseront debhelper ne " +"éventuelles de la Charte Debian. Les paquets qui utiliseront debhelper ne " "nécessiteront qu'une simple reconstruction pour être conformes aux nouvelles " "règles." @@ -148,7 +148,6 @@ msgstr "" #. type: textblock #: debhelper.pod:31 -#, fuzzy #| msgid "" #| "Except where tool explicitly denotes otherwise, all of the debhelper " #| "tools assumes that they run from root directory of an unpacked source " @@ -161,8 +160,7 @@ msgid "" msgstr "" "Sauf lorsque l'outil explicite le contraire, tous les outils debhelper sont " "prévus pour être exécutés dans le répertoire racine d'un paquet source " -"désarchivé. Cela leur permet de trouver les fichiers F et " -"F." +"désarchivé. Cela leur permet de trouver les fichiers F." # type: =head1 #. type: =head1 @@ -277,6 +275,13 @@ msgid "" "by default installs in every binary package when it does not have a package " "prefix (such as F or F)." msgstr "" +"Veuillez noter que pour le premier (ou unique) paquet binaire listé dans " +"F, debhelper utilisera F lorsqu'il n'y a aucun " +"fichier F.toto>. Cependant, c'est une bonne idée de garder " +"le préfixe F.> car c'est plus explicite. Les principales " +"exceptions sont les fichiers que debhelper installe par défaut dans chaque " +"paquet binaire lorsqu'il ne trouve pas de préfixe (comme F " +"ou F)." # type: textblock #. type: textblock @@ -322,16 +327,15 @@ msgid "" "The syntax of these files is intentionally kept very simple to make them " "easy to read, understand, and modify." msgstr "" +"La syntaxe de ces fichiers est volontairement simple, pour les rendre " +"faciles à lire, à comprendre et à modifier." # type: textblock #. type: =head2 #: debhelper.pod:104 -#, fuzzy #| msgid "Comments are ignored in debhelper config files." msgid "Executable debhelper config files" -msgstr "" -"Les commentaires sont ignorés dans les fichiers de configuration de " -"debhelper." +msgstr "Fichiers de configuration de l'exécutable debhelper." #. type: textblock #: debhelper.pod:106 @@ -339,6 +343,9 @@ msgid "" "If you need additional flexibility, many of the debhelper tools (e.g. " "L) support executing a config file as a script." msgstr "" +"Si vous avez besoin de plus de flexibilité, de nombreux outils de debhelper " +"(par exemple L) prennent en charge l'exécution d'un fichier " +"de configuration comme un script." #. type: textblock #: debhelper.pod:109 @@ -349,6 +356,11 @@ msgid "" "exec(1)> as interpreter of the config file to retain most of the original " "syntax while getting the additional flexibility you need." msgstr "" +"Pour utiliser cette fonctionnalité, il suffit de marquer le fichier comme " +"exécutable (B<.install >>). L'outil essaiera de " +"l'exécuter et utilisera la sortie du script. Le plus souvent, vous pouvez " +"utiliser L comme interpréteur du fichier de configuration pour " +"conserver la majorité de la syntaxe originale tout en gagnant en flexibilité." #. type: textblock #: debhelper.pod:117 @@ -356,6 +368,8 @@ msgid "" "When using executable debhelper config files, please be aware of the " "following:" msgstr "" +"Lorsque vous utilisez des fichiers de configuration exécutables de " +"debhelper, veuillez vous souvenir des choses suivantes :" #. type: =item #: debhelper.pod:122 debhelper.pod:127 @@ -368,6 +382,8 @@ msgid "" "The executable config file B exit with success (i.e. its return code " "should indicate success)." msgstr "" +"Le fichier de configuration exécutable B se terminer avec succès (le " +"code de retour doit l'indiquer)." #. type: textblock #: debhelper.pod:129 @@ -375,6 +391,9 @@ msgid "" "The output will be used exactly as it is. Notably, debhelper will I " "expand wildcards or strip comments in the output." msgstr "" +"La sortie sera utilisée exactement telle quelle. En particulier, debhelper " +"ne développera B les jokers, ni ne supprimera les commentaires de la " +"sortie." #. type: textblock #: debhelper.pod:134 @@ -383,6 +402,9 @@ msgid "" "the executable bit, then you can use L and its B " "script." msgstr "" +"Si vous avez besoin de construire le paquet sur un système de fichiers où " +"l'on ne peut pas désactiver le bit d'exécution, vous pouvez utiliser L et son script B." # type: =head1 #. type: =head1 @@ -485,10 +507,9 @@ msgstr "Alias obsolète pour B<-a>." #. type: textblock #: debhelper.pod:171 dh_install:77 dh_install:86 -#, fuzzy #| msgid "The option is removed in compat 12." msgid "This option is removed in compat 12." -msgstr "L'option est supprimée dans le niveau de compatibilité 12." +msgstr "Cette option est supprimée dans le niveau de compatibilité 12." # type: =item #. type: =item @@ -546,7 +567,7 @@ msgid "" msgstr "" "Ignore le fichier indiqué. Cela peut être utilisé si F contient un " "fichier de configuration debhelper avec une commande qui ne doit pas être " -"prise en compte. Nota : F, F, et F, F et F ne peuvent pas être ignorés, mais il n'existe aucune raison " "valable de les ignorer." @@ -659,7 +680,6 @@ msgstr "B<-X>I<élément>, B<--exclude=>I<élément>" # type: textblock #. type: textblock #: debhelper.pod:230 -#, fuzzy #| msgid "" #| "Exclude an item from processing. This option may be used multiple times, " #| "to exclude more than one thing. The \\fIitem\\fR is typically part of a " @@ -809,7 +829,7 @@ msgstr "" "Détermine si la construction parallèle doit être utilisée, si le système " "sous-jacent le permet. Le nombre de tâches parallèles est contrôlé, lors de " "la construction, par la variable d'environnement B " -"(L). Ce nombre peut également être soumis aux " +"(L). Ce nombre peut également être soumis aux " "limites spécifiques du système de construction." #. type: textblock @@ -824,7 +844,6 @@ msgstr "" #. type: textblock #: debhelper.pod:289 -#, fuzzy #| msgid "" #| "As an optimization, B will try to avoid passing these options to " #| "subprocesses, if they are unncessary and the only options passed. " @@ -883,8 +902,8 @@ msgid "" "shows which build system would be automatically selected, or which one is " "manually specified with the B<--buildsystem> option." msgstr "" -"Liste tous les processus de construction supportés par le système. Cette " -"liste inclut à la fois les processus par défaut et les processus tiers " +"Liste tous les processus de construction pris en charge par le système. " +"Cette liste inclut à la fois les processus par défaut et les processus tiers " "(marqués comme tels). Cette option montre également le processus de " "construction automatiquement sélectionné ou celui indiqué manuellement avec " "l'option B<--buildsystem>." @@ -897,7 +916,6 @@ msgstr "NIVEAUX DE COMPATIBILITÉ" # type: textblock #. type: textblock #: debhelper.pod:315 -#, fuzzy #| msgid "" #| "From time to time, major non-backwards-compatible changes need to be made " #| "to debhelper, to keep it clean and well-designed as needs change and its " @@ -922,13 +940,11 @@ msgstr "" "de tels changements ne cassent les paquets existants, un concept de niveau " "de compatibilité debhelper a été introduit. On devra préciser à debhelper le " "niveau de compatibilité qu'il doit employer, ce qui modifiera son " -"comportement de diverses manières. Le niveau de compatibilité est spécifié " -"dans le fichier F qui doit être présent." +"comportement de diverses manières." # type: textblock #. type: textblock #: debhelper.pod:322 -#, fuzzy #| msgid "" #| "Tell debhelper what compatibility level to use by writing a number to " #| "F. For example, to use v#RECOMMENDED_COMPAT# mode:" @@ -937,14 +953,16 @@ msgid "" "control> by adding a Build-Depends on the debhelper-compat package. For " "example, to use v#RECOMMENDED_COMPAT# mode, ensure F has:" msgstr "" -"Pour indiquer à debhelper le niveau de compatibilité à utiliser il faut " -"placer un nombre dans F. Par exemple, pour exploiter la " -"version #RECOMMENDED_COMPAT# :" +"Dans la version actuelle de debhelper, vous pouvez spécifier le niveau de " +"compatibilité à utiliser dans F en ajoutant une dépendance " +"de construction (Build-Depends) sur le paquet debhelper-compat. Par exemple, " +"pour exploiter la version #RECOMMENDED_COMPAT#, assurez-vous d'indiquer dans " +"F :" # type: verbatim #. type: verbatim #: debhelper.pod:326 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| " Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#)\n" #| "\n" @@ -952,7 +970,7 @@ msgid "" " Build-Depends: debhelper-compat (= #RECOMMENDED_COMPAT#)\n" "\n" msgstr "" -" Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#)\n" +" Build-Depends: debhelper-compat (= #RECOMMENDED_COMPAT#)\n" "\n" #. type: textblock @@ -964,6 +982,12 @@ msgid "" "a specific point release of debhelper (such as for the introduction of a new " "feature or bugfix within a compatibility level)." msgstr "" +"Cela sert aussi à avoir une dépendance de construction sur une version " +"suffisante de debhelper. Ainsi il n'est pas nécessaire d'indiquer une " +"dépendance de construction particulière sur debhelper, sauf si vous avez " +"besoin d'une mise à jour spécifique (comme pour l'introduction d'une " +"nouvelle fonctionnalité ou une correction de bogue à l'intérieur d'un niveau " +"de compatibilité)." #. type: textblock #: debhelper.pod:334 @@ -972,6 +996,9 @@ msgid "" "beta compatibility levels; packages experimenting with those compatibility " "levels should use F or B." msgstr "" +"Veuillez noter que debhelper ne fournit pas debhelper-compat pour " +"experimental ou pour les niveaux en version bêta. Les paquets qui souhaitent " +"expérimenter avec cela devraient utiliser F ou B." #. type: textblock #: debhelper.pod:338 @@ -987,11 +1014,22 @@ msgid "" "uses. So, if you specify compatibility level #RECOMMENDED_COMPAT# in " "F, ensure F has:" msgstr "" +"Les versions précédentes de debhelper nécessitaient d'indiquer le niveau de " +"compatibilité dans le fichier F, et la version actuelle " +"continue à le comprendre pour des raisons de compatibilité. Cependant, un " +"paquet ne devrait pas spécifier son niveau de compatibilité par plusieurs " +"méthodes à la fois. Pour utiliser cette méthode, F doit " +"contenir le niveau de compatibilité comme une valeur entière, et rien " +"d'autre. Si vous indiquez le niveau de compatibilité ainsi, votre paquet " +"aura besoin d'une dépendance de construction versionnée sur debhelper, égale " +"(ou supérieure) au niveau de compatibilité utilisé. Ainsi, si vous indiquez " +"le niveau #RECOMMENDED_COMPAT# dans F, assurez-vous que le " +"fichier F contient :" # type: verbatim #. type: verbatim #: debhelper.pod:349 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| " Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#)\n" #| "\n" @@ -999,7 +1037,7 @@ msgid "" " Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#~)\n" "\n" msgstr "" -" Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#)\n" +" Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#~)\n" "\n" # type: textblock @@ -1130,7 +1168,7 @@ msgid "" "B, if it was set to a list of things to exclude, such as " "B. Now it does." msgstr "" -"B, préalablement, ne supprimait pas les associations créées " +"Auparavant, B ne supprimait pas les associations créées " "avec B s'il était configuré sur une liste d'éléments tels " "que B. Maintenant il le fait." @@ -1142,7 +1180,7 @@ msgid "" "directory. In previous compatibility levels it silently refuses to do this." msgstr "" "B permet d'écraser les pages de manuel existantes dans le " -"répertoire de construction du paquet. Préalablement, il refusait en silence " +"répertoire de construction du paquet. Auparavant, il refusait en silence " "de le faire." #. type: =item @@ -1169,7 +1207,7 @@ msgstr "" "B cherchera récursivement les fichiers dans F s'il " "ne les trouve pas dans le répertoire courant (ou dans le répertoire indiqué " "par B<--sourcedir>). Cela permet à B d'interopérer avec " -"B, qui place les fichiers dans F, sans " +"B qui place les fichiers dans F, sans " "nécessiter de paramètres particuliers." # type: textblock @@ -1269,7 +1307,7 @@ msgid "" "Multiarch support. In particular, B passes multiarch " "directories to autoconf in --libdir and --libexecdir." msgstr "" -"Prise en charge multiarchitecture. En particulier B passe " +"Prise en charge multiarchitecture. En particulier, B passe " "les répertoires multiarchitectures à B dans B<--libdir> et B<--" "libexecdir>." @@ -1418,8 +1456,8 @@ msgid "" "passing B<--max-parallel> with a value of 1." msgstr "" "Debhelper active par défaut la parallélisation pour tous les systèmes de " -"construction qui le supportent. Cela peut être désactivé en utilisant " -"l'option B<--no-parallel> ou en passant la valeur 1 à l'option B<--max-" +"construction qui le gèrent. Cela peut être désactivé en utilisant " +"l'option B<--no-parallel> ou en passant la valeur B<1> à l'option B<--max-" "parallel>." #. type: textblock @@ -1563,7 +1601,6 @@ msgstr "" #. type: textblock #: debhelper.pod:631 -#, fuzzy #| msgid "" #| "B no longer creates the package build directory when skipping running " #| "debhelper commands. This will not affect packages that only build with " @@ -1575,11 +1612,11 @@ msgid "" "packages that only build with debhelper commands, but it may expose bugs in " "commands not included in debhelper." msgstr "" -"B ne crée plus le répertoire de construction du paquet lors de " -"l'omission des commandes debhelper en cours. Cela n'affectera pas les " -"paquets qui se construisent uniquement avec dehelper, mais pourrait faire " -"apparaître des bogues dans les commandes qui ne sont pas incluses avec " -"debhelper." +"B : B ne crée plus le répertoire de " +"construction du paquet lors de l'omission des commandes debhelper en cours. " +"Cela n'affectera pas les paquets qui se construisent uniquement avec " +"debhelper, mais pourrait faire apparaître des bogues dans les commandes qui " +"ne sont pas incluses avec debhelper." #. type: textblock #: debhelper.pod:636 @@ -1589,6 +1626,10 @@ msgid "" "there has been no reports of issues caused by this bug in those ~5 years, " "this item have been removed rather than fixed." msgstr "" +"Cette fonctionnalité de compatibilité avait un bogue depuis sa création dans " +"debhelper/9.20130516, qui la faisait échouer en compat 9 et précédent. Comme " +"il n'y a eu aucun rapport de problème causé par ce bogue en 5 ans, cela a " +"été supprimé plutôt que corrigé." #. type: =item #: debhelper.pod:643 @@ -1627,7 +1668,6 @@ msgstr "" #. type: textblock #: debhelper.pod:663 -#, fuzzy #| msgid "" #| "Please note that the B tool have a slightly different " #| "behaviour in some cases (e.g. when using the B<--name> parameter)." @@ -1657,7 +1697,6 @@ msgstr "" #. type: textblock #: debhelper.pod:677 -#, fuzzy #| msgid "" #| "The B buildsystem now passes B to L. Derivative buildsystems (e.g. B " @@ -1668,8 +1707,9 @@ msgid "" "or B) are unaffected by this change." msgstr "" "Le système de construction B passe maintenant les options " -"B à L. Les systèmes dérivés " -"(comme B ou B) ne sont pas affectés par ce changement." +"B à L. Les systèmes " +"dérivés (comme B ou B) ne sont pas affectés par ce " +"changement." #. type: textblock #: debhelper.pod:683 @@ -1754,10 +1794,11 @@ msgid "" "Migration note: A bug in debhelper 11 up to 11.1.5 made B " "incorrectly ignore B<--sourcedir>." msgstr "" +"Note de migration : un bogue dans debhelper 11 jusqu'à 11.1.5 faisait que " +"B ignorait B<--sourcedir> de manière incorrecte." #. type: textblock #: debhelper.pod:726 -#, fuzzy #| msgid "" #| "The B and B build systems no longer pass B<-I." #| "> to perl. Packages that still need this behaviour can get emulate it by " @@ -1798,7 +1839,7 @@ msgstr "" "De plus, cette fonction deviendra peut-être obsolète car l'amont a " "l'intention de retirer la prise en charge de la variable d'environnement " "B. Lorsque ce sera le cas, cette variable sera aussi " -"supprimée rétroactivement des niveaux de compatibilités existants." +"supprimée rétroactivement des niveaux de compatibilité existants." #. type: textblock #: debhelper.pod:745 @@ -1817,6 +1858,10 @@ msgid "" "I of the documentation in a different path to comply with the " "recommendation from Debian policy §12.3 (since version 3.9.7)." msgstr "" +"Les outils B et B pourraient maintenant " +"installer I de la documentation dans un répertoire différent, " +"pour satisfaire les recommandations de la Charte Debian §12.3 (depuis la " +"version 3.9.7)." #. type: textblock #: debhelper.pod:754 @@ -1826,6 +1871,9 @@ msgid "" "change is not relevant for that source package and you can skip to the next " "change." msgstr "" +"Si un paquet source contient un seul paquet binaire dans F, " +"ou si aucun des paquets n'est un paquet I<-doc>, alors ce changement n'a pas " +"d'effet pour ce paquet source, et vous pouvez aller au changement suivant." #. type: textblock #: debhelper.pod:759 @@ -1837,10 +1885,15 @@ msgid "" "package> >> in the given doc package. I.e. the path can change but the " "documentation is still shipped in the I<-doc> package." msgstr "" +"Par défaut, ces outils essaient maintenant de déterminer un « paquet " +"principal pour la documentation » (que l'on appellera I) " +"pour chaque paquet I<-doc>. S'ils trouvent un tel I, ils " +"installeront la documentation sous F<< /usr/share/doc/I >> " +"pour le paquet considéré. C'est-à-dire que le chemin peut changer, mais la " +"documentation est toujours fournie par le paquet I<-doc>." #. type: textblock #: debhelper.pod:767 -#, fuzzy #| msgid "" #| "The B<--doc-main-package> option can be used when the auto-detection is " #| "insufficient." @@ -1850,7 +1903,9 @@ msgid "" "to diverge from Debian policy recommendation." msgstr "" "L'option B<--doc-main-package> peut être utilisée si la détection " -"automatique est insuffisante." +"automatique est insuffisante, ou pour réinitialiser le chemin à sa valeur " +"précédente s'il y a une raison de diverger des recommandations de la " +"Charte Debian." #. type: textblock #: debhelper.pod:771 @@ -1859,6 +1914,9 @@ msgid "" "include the copyright file, changelog files, README.Debian, etc. These " "files will still be installed in the path F<< /usr/share/doc/I >>." msgstr "" +"Quelques documents ne sont pas affectés par ce changement. En particulier le " +"fichier copyright, les fichiers changelog, README.Debian, etc. Ces fichiers " +"seront toujours installés sous F<< /usr/share/doc/I >>." #. type: textblock #: debhelper.pod:778 @@ -1903,6 +1961,9 @@ msgid "" "dependency by default. This means that B<-VUpstream-Version> (a.k.a. B<-V>) " "is now the default." msgstr "" +"B génère maintenant des fichiers shlibs avec des dépendances " +"versionnées par défaut. Cela veut dire que B<-VUpstream-Version> (ou B<-V>) " +"est maintenant le comportement par défaut." #. type: textblock #: debhelper.pod:801 @@ -1911,6 +1972,9 @@ msgid "" "obtained by passing B<-VNone> instead. However, please see " "L for the caveat of unversioned dependencies." msgstr "" +"Si une dépendance non versionnée est requise, cela peut être obtenu en " +"passant B<-VNone> à la place. Veuillez tout de même consulter " +"L pour l'utilisation des dépendances non versionnées." # type: =item #. type: textblock @@ -1993,6 +2057,7 @@ msgstr "" #: debhelper.pod:848 msgid "The B tool will now default to B<--list-missing>." msgstr "" +"Le comportement par défaut de B est maintenant B<--list-missing>." #. type: textblock #: debhelper.pod:852 @@ -2000,6 +2065,8 @@ msgid "" "The B tool will now only pass libraries to L if the ELF binary has a SONAME (containing \".so\")." msgstr "" +"B passera maintenant les bibliothèques à L " +"si le binaire ELF a un SONAME (contenant « .so »)." #. type: textblock #: debhelper.pod:857 @@ -2007,6 +2074,8 @@ msgid "" "The B tool no longer compresses examples (i.e. anything " "installed in F</examples>>.)" msgstr "" +"B ne compresse plus les exemples (c'est-à-dire tout ce qui est " +"installé dans F</examples>>)." #. type: textblock #: debhelper.pod:862 @@ -2017,6 +2086,11 @@ msgid "" "error. If you want to skip these commands, then please insert an empty " "override target for them in F (e.g. I)" msgstr "" +"La séquence standard de B comprend maintenant B et " +"B par défaut. Cela rend les séquences B et " +"B obsolètes et elles échoueront avec une erreur. Si vous " +"souhaitez sauter ces commandes, veuillez insérer des cibles de réécriture " +"vides pour elles dans F (par exemple I)." #. type: textblock #: debhelper.pod:871 @@ -2025,6 +2099,10 @@ msgid "" "libexecdir> variable and thus relies on the build system default - which " "should be B (per FHS 3.0, adopted in Debian Policy 4.1.5)." msgstr "" +"Les systèmes de construction B et B ne positionnent plus " +"explicitement la variable B<--libexecdir>, et s'appuient donc sur le système " +"de construction par défaut – qui devrait être B (selon la " +"FHS 3.0, adoptée dans la Charte Debian 4.1.5)." #. type: textblock #: debhelper.pod:876 @@ -2033,11 +2111,14 @@ msgid "" "parameter can often be passed manually via L. E.g. " "via the following example:" msgstr "" +"Si un paquet amont particulier n'utilise pas la bonne valeur par défaut, le " +"paramètre peut souvent être passé manuellement avec L. " +"Par exemple :" # type: verbatim #. type: verbatim #: debhelper.pod:880 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "\toverride_dh_auto_configure:\n" #| "\t\tdh_auto_configure -- --with-foo --disable-bar\n" @@ -2047,14 +2128,14 @@ msgid "" " \tdh_auto_configure -- --libexecdir=/usr/libexec\n" "\n" msgstr "" -"\toverride_dh_auto_configure:\n" -"\t\tdh_auto_configure -- --with-toto --disable-titi\n" +" override_dh_auto_configure:\n" +" \tdh_auto_configure -- --libexecdir=/usr/libexec\n" "\n" #. type: textblock #: debhelper.pod:883 msgid "Note the B<--> before the B<--libexecdir> parameter." -msgstr "" +msgstr "Remarquez le B<--> avant le paramètre B<--libexecdir>." #. type: textblock #: debhelper.pod:887 @@ -2064,6 +2145,10 @@ msgid "" "level 3, where B began to automatically compute the resulting " "F control file." msgstr "" +"B n'installe plus le fichier F fournit par le " +"responsable. Ce fichier est obsolète depuis le niveau de compatibilité 3, " +"lorsque B a commencé à calculer automatiquement le " +"F résultant du fichier control." #. type: textblock #: debhelper.pod:894 @@ -2073,6 +2158,10 @@ msgid "" "now be used in such a case to ensure the service is properly started under " "both sysvinit and systemd." msgstr "" +"B ne s'appuie plus sur B pour s'occuper " +"des services systemd qui ont une alternative pour sysvinit. Les deux outils " +"doivent maintenant être utilisés dans ce cas pour s'assurer que le service " +"est démarré correctement, à la fois avec systemd et sysvinit." #. type: textblock #: debhelper.pod:899 @@ -2080,6 +2169,9 @@ msgid "" "If you have an override for B (e.g. to call it with B<--no-" "start>) then you will probably need one for B as well now." msgstr "" +"Si vous avez une réécriture pour B (par exemple pour " +"l'appeler avec B<--no-start>), vous en aurez sûrement besoin d'une pour " +"B aussi." #. type: textblock #: debhelper.pod:903 @@ -2089,6 +2181,10 @@ msgid "" "${misc:Pre-Depends}> in its B field before upgrading to compat " "12." msgstr "" +"Ce changement amène B à injecter un champ I sur B<< init-system-helpers (>= 1.54~) >>. Veuillez vous assurer " +"que le paquet utilise B<${misc:Pre-Depends}> dans son champ B " +"avant de mettre à niveau vers la compat 12." #. type: textblock #: debhelper.pod:910 @@ -2099,6 +2195,12 @@ msgid "" "B to false to revert to the previous behaviour. See " "B for details and examples." msgstr "" +"L'outil tiers B (du paquet B) utilise maintenant la " +"variable B pour l'installation des sources dans les " +"paquets -dev, et plus uniquement lors de la construction. Veuillez " +"positionner B à faux pour obtenir le comportement " +"précédent. Consultez B pour " +"plus de détails et des exemples." #. type: textblock #: debhelper.pod:918 @@ -2106,6 +2208,8 @@ msgid "" "B is now included in the B standard sequence by " "default." msgstr "" +"B est maintenant inclus par défaut dans la séquence " +"B standard." #. type: textblock #: debhelper.pod:923 @@ -2113,13 +2217,14 @@ msgid "" "The B buildsystem is now removed. Please use the third-" "party build system B instead." msgstr "" +"Le système de construction B est supprimé. Veuillez " +"utiliser le système tiers B à la place." #. type: =item #: debhelper.pod:928 -#, fuzzy #| msgid "v1" msgid "v13" -msgstr "v1" +msgstr "v13" #. type: textblock #: debhelper.pod:930 strings-kept-translations.pod:9 @@ -2132,10 +2237,9 @@ msgstr "" # type: textblock #. type: textblock #: debhelper.pod:932 -#, fuzzy #| msgid "Changes from v10 are:" msgid "Changes from v12 are:" -msgstr "Les changements par rapport à la version 10 sont :" +msgstr "Les changements par rapport à la version 12 sont :" #. type: textblock #: debhelper.pod:938 @@ -2145,6 +2249,11 @@ msgid "" "passes extra parameters to upstream test runner should be reviewed as " "B is not command line compatible with B." msgstr "" +"Le système de construction B utilise maintenant B à " +"la place de B pour la suite de tests. Chaque réécriture de " +"B qui passe des paramètres supplémentaires aux tests amont " +"devrait être vérifiée, car B n'est pas compatible avec B." # type: =head1 #. type: =head1 @@ -2177,7 +2286,7 @@ msgid "" msgstr "" "Si le paquet source produit plus d'un paquet binaire, les programmes de " "debhelper construiront tous les paquets binaires. Si le paquet source doit " -"construire un paquet dépendant de l'architecture, et un paquet indépendant " +"construire un paquet dépendant de l'architecture et un paquet indépendant " "de l'architecture, ce comportement ne conviendra pas. En effet, il convient " "de construire les paquets dépendants de l'architecture dans « binary-arch » " "de F, et les paquets indépendants de l'architecture dans " @@ -2208,7 +2317,7 @@ msgid "" msgstr "" "Tout d'abord, chaque paquet dont le champ B de I ne contient pas l'architecture B sera exclu " -"(L)." +"(L)." #. type: textblock #: debhelper.pod:970 @@ -2581,7 +2690,6 @@ msgstr "B" # type: textblock #. type: textblock #: debhelper.pod:1108 -#, fuzzy #| msgid "" #| "Temporarily specifies what compatibility level debhelper should run at, " #| "overriding any value in F." @@ -2591,8 +2699,8 @@ msgid "" "the F file." msgstr "" "Indique temporairement le niveau de compatibilité avec lequel debhelper doit " -"fonctionner. Cette valeur supplante toute valeur précisée dans F." +"fonctionner. Cette valeur supplante toute valeur précisée par Build-Depends " +"sur debhelper-compat ou dans F." # type: =item #. type: =item @@ -2682,10 +2790,9 @@ msgstr "" # type: =item #. type: =item #: debhelper.pod:1140 -#, fuzzy #| msgid "B" msgid "B" -msgstr "B" +msgstr "B" #. type: textblock #: debhelper.pod:1142 @@ -2695,6 +2802,10 @@ msgid "" "addon to run with the --with flag in the debian/rules file. Any --without " "calls specifying an addon in this environment variable will not be run." msgstr "" +"Les rajouts à B indiqués seront exécutés lors de la séquence de commandes. " +"Cela équivaut à les indiquer avec le drapeau B<--with> dans le fichier F. Les rajouts précédés de B<--without> ne seront pas exécutés, même s'ils " +"sont indiqués dans cette variable d'environnement." #. type: textblock #: debhelper.pod:1147 @@ -2704,6 +2815,11 @@ msgid "" "having to patch a large number of rules file. If at all possible, this " "should be avoided in favor of a --with flag in the rules file." msgstr "" +"Cela est prévu pour être utilisé par les dérivées ou les configurations " +"locales spécifiques qui ont besoin d'un rajout lors de plusieurs " +"construction, sans avoir à modifier un grand nombre de fichier F. Il " +"est préférable d'éviter cette méthode et d'utiliser plutôt les drapeaux B<--" +"with> dans le fichier F." # type: =head1 #. type: =head1 @@ -2803,7 +2919,7 @@ msgid "" msgstr "" "Ce document contient les instructions de mise à jour depuis les niveaux de " "compatibilité qui ne sont plus pris en charge. Ainsi, il existe surtout pour " -"des raisons historiques, et pour ceux qui voudraient faire une mise à jour " +"des raisons historiques et pour ceux qui voudraient faire une mise à jour " "depuis un niveau de compatibilité qui n'est plus pris en charge." #. type: textblock @@ -2950,7 +3066,7 @@ msgstr "" msgid "B will correct existing links to conform with policy." msgstr "" "B corrigera les liens existants pour les rendre conformes à la " -"Charte Debian." +"Charte Debian." # type: textblock #. type: textblock @@ -3158,6 +3274,14 @@ msgid "" "insists on \"simple\" relations (e.g. a relation like \"BI | B\" will I imply B<--with> I)." msgstr "" +"Une relation B sur le paquet BI " +"implique B<--with> I. Cela évite un B<--with> explicite dans " +"F qui dupliquerait ce qui est écrit dans les dépendances de " +"construction dans F. Seules les relations décrites dans le " +"champ B sont utilisées (B et B sont volontairement non pris en charge). Gardez à l'esprit que " +"B exige des relations simples (une relation du type « BI | B » n'impliquera I B<--with> I)." # type: =item #. type: =item @@ -3220,7 +3344,7 @@ msgid "" msgstr "" "Les autres options fournies à B sont passées en paramètre à chaque " "commande exécutée. Cela est utile tant pour les options comme B<-v>, B<-X> " -"ou B<-N> que pour des options plus spécialisées. " +"ou B<-N> que pour des options plus spécialisées." # type: =head1 #. type: =head1 @@ -3257,7 +3381,7 @@ msgid "" "This is a very simple rules file, for packages where the default sequences " "of commands work with no additional options." msgstr "" -"C'est un fichier rules très simple, pour les paquets où les séquences de " +"C'est un fichier F très simple, pour les paquets où les séquences de " "commandes par défaut fonctionnent sans aucune option particulière." # type: verbatim @@ -3289,7 +3413,7 @@ msgstr "" # type: verbatim #. type: verbatim #: dh:119 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "\toverride_dh_strip:\n" #| "\t\tdh_strip -Xfoo\n" @@ -3464,7 +3588,7 @@ msgid "" "in a subdirectory, which will be removed on B." msgstr "" "Voici un exemple d'utilisation des commandes BI<*> pour réaliser " -"la construction dans un sous-répertoire, qui sera ensuite supprimé lors du " +"la construction dans un sous-répertoire qui sera ensuite supprimé lors du " "B :" # type: verbatim @@ -3865,7 +3989,7 @@ msgid "" "[S I>]" msgstr "" "B [I] " -"[I] [B<--> I]" +"[I] [B<--> I]" # type: textblock #. type: textblock @@ -3882,7 +4006,7 @@ msgstr "" "appropriées du processus de construction d'après le type du paquet. Par " "exemple, s'il trouve un fichier F, il construit le paquet avec " "B (ou B si les variables d'environnement sont définies). S'il y " -"a un fichier F ou F il les lance pour réaliser la " +"a un fichier F ou F, il les lance pour réaliser la " "construction du paquet." # type: textblock @@ -3963,7 +4087,7 @@ msgstr "" "paquet. Par exemple, s'il trouve un fichier F et qu'il contient " "une instruction B, B, B, il fait le ménage en " "exécutant B (ou B si cette variable d'environnement est " -"définie). S'il y a un fichier F ou F il les lance pour " +"définie). S'il y a un fichier F ou F, il les lance pour " "réaliser le ménage du paquet." # type: textblock @@ -4204,7 +4328,7 @@ msgstr "" "automatiquement le jeu de tests d'un paquet. Il le fait en lançant les " "commandes appropriées du processus de construction d'après le type du " "paquet. Par exemple, s'il y a un Makefile et qu'il contient un bloc B " -"ou B il exécutera B (ou B si cette variable " +"ou B, il exécutera B (ou B si cette variable " "d'environnement est définie). Si les tests produisent une erreur, la " "commande retourne une valeur non nulle. S'il n'y a pas de jeu de tests, la " "commande retourne zéro sans rien faire." @@ -4217,7 +4341,7 @@ msgid "" "doesn't work, you're encouraged to skip using B at all, and " "just run the test suite manually." msgstr "" -"B fonctionne avec 90% des paquets environ comportant un jeu de " +"B fonctionne avec 90 % des paquets environ comportant un jeu de " "tests. Si ça ne fonctionne pas, il suffit de sauter B et de " "lancer le jeu de tests manuellement." @@ -4433,7 +4557,7 @@ msgid "" "Use this if you want the generated F<.deb> files to be put in a directory " "other than the default of \"F<..>\"." msgstr "" -"Permet de stocker les fichiers F<.deb> produits, dans un répertoire autre " +"Permet de stocker les fichiers F<.deb> produits dans un répertoire autre " "que le répertoire par défaut « F<..> »." # type: =item @@ -4669,7 +4793,7 @@ msgid "" "appear to be already compressed based on their extensions), and all " "F files. Plus PCF fonts underneath F" msgstr "" -"Par défaut, B compresse les fichiers que la Charte Debian " +"Par défaut, B compresse les fichiers que la Charte Debian " "indique comme devant être compressés. Cela concerne tous les fichiers de " "F, F, tous les fichiers F ainsi " "que les polices PCF stockées dans F. Il compressera " @@ -4762,17 +4886,18 @@ msgstr "Charte Debian, version 3.0" #: dh_dwz:5 msgid "dh_dwz - optimize DWARF debug information in ELF binaries via dwz" msgstr "" +"dh_dwz - Optimiser l'information de débogage DWARF dans les binaires ELF " +"grâce à dwz" # type: textblock #. type: textblock #: dh_dwz:18 -#, fuzzy #| msgid "" #| "B [S>] [B<-n>] [S " #| "I>]" msgid "B [S>] [B<-X>I] [S I>]" msgstr "" -"B [I] [B<-n>] [B<--> I]" +"B [I] [B<-X>I] [S I]" #. type: textblock #: dh_dwz:22 @@ -4781,11 +4906,14 @@ msgid "" "of the DWARF debug information in ELF binaries. It does so by running " "L on all the ELF binaries in the package." msgstr "" +"B est un programme de la suite debhelper qui optimise la taille (non " +"compressée) des informations DWARF de débogage dans les binaires ELF. Cela " +"est effectué en exécutant L sur tous les binaires ELF du paquet." #. type: =item #: dh_dwz:30 msgid "B<--dwz-multifile>, B<--no-dwz-multifile>" -msgstr "" +msgstr "B<--dwz-multifile>, B<--no-dwz-multifile>" #. type: textblock #: dh_dwz:32 @@ -4795,6 +4923,10 @@ msgid "" "least 2 ELF binaries, B will instruct L to generate a " "multifile for the package." msgstr "" +"Détermine si L doit créer un objet I à partir des " +"binaires ELF d'un même paquet (c'est le comportement par défaut). Si oui, " +"dans un paquet qui fournit au moins 2 binaires ELF, B demandera à " +"L de générer un objet I pour le paquet." #. type: textblock #: dh_dwz:37 @@ -4803,6 +4935,9 @@ msgid "" "can fit on a single command line. If this becomes a problem, please pass " "B<--no-dwz-multifile> to work around the issue." msgstr "" +"Cette option pourrait ne pas fonctionner si un paquet contient plus de " +"binaires ELF que ne peut en contenir une seule ligne de commande. Si cela " +"devenait un problème, utilisez B<--no-dwz-multifile> pour le contourner." #. type: textblock #: dh_dwz:41 @@ -4810,6 +4945,8 @@ msgid "" "The generated multifile will be compressed with B." msgstr "" +"Le I créé sera compressé avec B." # type: textblock #. type: textblock @@ -4829,11 +4966,13 @@ msgid "" "Pass I to L when it processes ELF binaries. This is mostly " "useful for setting memory related parameters (e.g. -l and -L)." msgstr "" +"Passe les I à L lors du traitement des binaires ELF. " +"Cela est surtout utile pour les paramètres liés à la mémoire (comme B<-l> et " +"B<-L>)." # type: textblock #. type: textblock #: dh_dwz:59 -#, fuzzy #| msgid "" #| "If the B environment variable contains B, " #| "nothing will be stripped, in accordance with Debian policy (section 10.1 " @@ -4845,9 +4984,8 @@ msgid "" "\"Binaries\")." msgstr "" "Si la variable d'environnement B contient B, " -"rien ne sera dépouillé, conformément à la Charte Debian (section 10.1 " -"« Binaries »). Cela empêchera aussi la création automatique des paquets de " -"symboles de débogage." +"rien ne sera dépouillé, conformément à la Charte Debian (section 10.1 " +"« Binaries »)." #. type: textblock #: dh_dwz:63 @@ -4858,6 +4996,11 @@ msgid "" "build times (e.g. for \"build and test\"-cycles) rather than optimizing for " "size." msgstr "" +"Bien que cet outil ne supprime pas les informations de débogage des " +"binaires, il est quand même évité lorsque B contient " +"B, car B est souvent utilisé pour optimiser la durée de " +"construction (comme dans les cycles « build and test ») plutôt que pour " +"optimiser la taille." # type: textblock #. type: textblock @@ -4882,7 +5025,7 @@ msgid "" "state -- a state that complies with Debian policy." msgstr "" "B est un programme de la suite debhelper chargé de configurer " -"correctement (c'est-à-dire conformément à la Charte Debian) les droits sur " +"correctement (c'est-à-dire conformément à la Charte Debian) les droits sur " "les fichiers et les sous-répertoires du répertoire de construction du paquet." # type: textblock @@ -4940,12 +5083,12 @@ msgstr "" # type: textblock #. type: textblock #: dh_gconf:5 -#, fuzzy #| msgid "dh_gconf - install GConf defaults files and register schemas" msgid "" "dh_gconf - install GConf defaults files and register schemas (deprecated)" msgstr "" -"dh_gconf - Installer les fichiers par défaut de GConf et inscrire les schémas" +"dh_gconf - Installer les fichiers par défaut de GConf et inscrire les " +"schémas (obsolète)" # type: textblock #. type: textblock @@ -5065,7 +5208,7 @@ msgid "" "passes in some additional useful flags." msgstr "" "Ce programme est simplement une encapsulation de L. " -" B l'invoque pour chacun des paquets construits (plus les " +"B l'invoque pour chacun des paquets construits (plus les " "paquets dbgsym concernés), et lui transmet quelques options utiles." #. type: textblock @@ -5247,7 +5390,6 @@ msgstr "" # type: textblock #. type: textblock #: dh_install:36 -#, fuzzy #| msgid "" #| "From debhelper compatibility level 7 on, B will fall back to " #| "looking in F for files, if it doesn't find them in the " @@ -5315,6 +5457,8 @@ msgid "" "Used with the deprecated B<--list-missing> and B<--fail-missing> options. " "Please refer to L for the documentation of this file." msgstr "" +"Utilisé avec les options obsolètes B<--list-missing> et B<--fail-missing>. " +"Consultez L pour la documentation de ce fichier." # type: =item #. type: =item @@ -5330,6 +5474,10 @@ msgid "" "has processed all the files. Please see L for the " "documentation of this option." msgstr "" +"B : veuillez utiliser B à la place. Si " +"vous utilisez cette option, B appellera B avec cette " +"option après le traitement de tous les fichiers. Consultez L " +"pour la documentation de cette option." # type: =item #. type: =item @@ -5345,6 +5493,10 @@ msgid "" "has processed all the files. Please see L for the " "documentation of this option." msgstr "" +"B : veuillez utiliser B à la place. Si " +"vous utilisez cette option, B appellera B avec cette " +"option après le traitement de tous les fichiers. Consultez L " +"pour la documentation de cette option." # type: =item #. type: =item @@ -5646,7 +5798,6 @@ msgstr "" # type: textblock #. type: textblock #: dh_installchangelogs:24 -#, fuzzy #| msgid "" #| "An upstream F file may be specified as an option. If none is " #| "specified, it looks for files with names that seem likely to be " @@ -5658,8 +5809,9 @@ msgid "" "package is using compatibility level 7 or above)." msgstr "" "Un journal amont des modifications (upstream F) peut être indiqué " -"en option. Si rien n'est indiqué, le processus cherche des fichiers portant " -"des noms susceptibles d'être des changelog. (à partir de la version 7)." +"en option. Si rien n'est indiqué, B cherche des " +"fichiers portant des noms susceptibles d'être des changelog tel que décrit " +"dans les paragraphes suivants (à partir de la version 7)." #. type: textblock #: dh_installchangelogs:29 @@ -5673,6 +5825,14 @@ msgid "" "compatibility level 7 or any later) will look for changelog files in the " "source directory (e.g. the root or the F subdirectory)." msgstr "" +"Dans les paquets non natifs, B cherchera d'abord des " +"changelogs installés dans le système de construction amont dans F<< usr/" +"share/doc/I >> (dans le répertoire de construction du paquet) et " +"renommera le plus probable en F<< usr/share/doc/I/changelog >>. " +"Veuillez noter que B ne cherche I dans le " +"répertoire source (comme F). Autrement, B " +"(à partir de la version 7) cherchera des fichiers journaux dans le " +"répertoire source (par exemple la racine ou le sous-répertoire F)." # type: textblock #. type: textblock @@ -5686,7 +5846,6 @@ msgstr "" #. type: textblock #: dh_installchangelogs:42 -#, fuzzy #| msgid "" #| "If the upstream changelog is an F file (determined by file " #| "extension), it will be installed as F [S>] [B<--name=>I]" -msgstr "B [B] [B<--name=>I]" +msgstr "B [B] [B<--name=>I]" # type: textblock #. type: textblock @@ -5944,7 +6104,7 @@ msgstr "I.prerm" #. type: textblock #: dh_installdeb:37 msgid "These maintainer scripts are installed into the F directory." -msgstr "Ces scripts de maintenance sont installés dans le répertoire F" +msgstr "Ces scripts de maintenance sont installés dans le répertoire F." # type: textblock #. type: textblock @@ -5981,7 +6141,7 @@ msgid "" "earlier. In compat 10, please use L." msgstr "" "Veuillez noter que I.shlibs est uniquement installé si le niveau de " -"compatibilité est 9 ou inférieur. En compat 10, veuillez utiliser " +"compatibilité est 9 ou inférieur. En version 10, veuillez utiliser " "L." # type: =item @@ -5997,6 +6157,10 @@ msgid "" "conffiles. However, it has become de facto obsolete since debhelper " "automatically computed which files should be marked as conffiles." msgstr "" +"Historiquement ce fichier était nécessaire pour marquer manuellement les " +"fichiers comme des conffiles. Cependant il est devenu obsolète de facto " +"depuis que debhelper détermine automatiquement quels fichiers doivent être " +"marqués comme conffiles." #. type: textblock #: dh_installdeb:57 @@ -6005,6 +6169,8 @@ msgid "" "installed into the F directory. In compatibility level 12 and " "later, the file is silently ignored." msgstr "" +"Jusqu'à la version 11, ce fichier de contrôle était installé dans le dossier " +"F. À partir de la version 12, ce fichier est ignoré en silence." # type: =item #. type: =item @@ -6209,7 +6375,7 @@ msgid "" "translations from there." msgstr "" "Si ce répertoire existe, ce programme utilisera L pour " -"produire un fichier multilingues de modèles." +"produire un fichier multilingue de modèles." # type: textblock #. type: textblock @@ -6242,7 +6408,6 @@ msgstr "" # type: textblock #. type: textblock #: dh_installdirs:17 -#, fuzzy #| msgid "" #| "B [S>] [B<--sourcedir=>I] [B<-" #| "X>I] [S ...>]" @@ -6250,8 +6415,8 @@ msgid "" "B [S>] [B<-A>] [B<--sourcedir=>I] " "[B<--create-in-sourcedir>] [S ...>]" msgstr "" -"B [S>] [B<--sourcedir=>I] " -"[B<-X>I<élément>] [S ...>]" +"B [S>] [B<-A>] [B<--" +"sourcedir=>I] [B<--create-in-sourcedir>] [S ...>]" # type: textblock #. type: textblock @@ -6272,7 +6437,7 @@ msgid "" msgstr "" "De nombreux paquets peuvent se construire en omettant complètement l'appel à " "B. En particulier, les autres commandes B sont censées " -"créer les répertoire voulus." +"créer les répertoires voulus." # type: =item #. type: =item @@ -6284,7 +6449,7 @@ msgstr "debian/I.dirs" #. type: textblock #: dh_installdirs:34 msgid "Lists directories to be created in I." -msgstr "Liste les répertoires à créer dans I." +msgstr "Liste les répertoires à créer dans I." #. type: textblock #: dh_installdirs:36 @@ -6309,7 +6474,7 @@ msgstr "" #. type: =item #: dh_installdirs:51 msgid "B<--create-in-sourcedir>, B<--no-create-in-sourcedir>" -msgstr "" +msgstr "B<--create-in-sourcedir>, B<--no-create-in-sourcedir>" #. type: textblock #: dh_installdirs:53 @@ -6318,14 +6483,15 @@ msgid "" "F) I in the package build directory (usually F<< " "debian/I >>)." msgstr "" +"Détermine s'il faut créer les répertoires indiqués dans le répertoire source " +"(habituellement F) I de le faire dans le répertoire de " +"construction du paquet (F<< debian/I >>)." #. type: textblock #: dh_installdirs:57 -#, fuzzy #| msgid "The default is to create debug symbol packages." msgid "The default is B<--no-create-in-sourcedir>." -msgstr "" -"Le comportement par défaut est de créer un paquet de symboles de débogage." +msgstr "Le comportement par défaut est B<--no-create-in-sourcedir>." #. type: textblock #: dh_installdirs:61 @@ -6333,6 +6499,8 @@ msgid "" "Consider I the source directory for the packages acted on instead of " "the default (which is usually F)." msgstr "" +"Utiliser I comme le répertoire source des paquets, au lieu de " +"la valeur par défaut (généralement F)." #. type: textblock #: dh_installdirs:64 @@ -6341,6 +6509,9 @@ msgid "" "option (when B<--no-create-in-sourcedir> is in effect, this option does " "nothing in B)." msgstr "" +"Veuillez noter que cette option est dépendante de l'option B<--create-in-" +"sourcedir> (lorsque B<--no-create-in-sourcedir> est utilisé, cette option ne " +"fait rien dans B)." # type: =item #. type: =item @@ -6405,7 +6576,6 @@ msgstr "" # type: textblock #. type: textblock #: dh_installdocs:31 dh_installexamples:27 dh_installinfo:24 dh_installman:69 -#, fuzzy #| msgid "" #| "From debhelper compatibility level 7 on, B will fall back to " #| "looking in F for files, if it doesn't find them in the " @@ -6416,14 +6586,13 @@ msgid "" "looking in F for files, if it does not find them in the current " "directory (or wherever you've told it to look using B<--sourcedir>)." msgstr "" -"Depuis la version 7 de debhelper, B cherchera dans " +"Depuis la version 11 de debhelper, B cherchera dans " "l'arborescence F pour trouver les fichiers s'il ne les trouve " "pas dans le répertoire courant (ou dans celui indiqué par l'utilisation de " "B<--sourcedir>)." #. type: textblock #: dh_installdocs:35 -#, fuzzy #| msgid "" #| "In compat 11 and later, B offers many of the features " #| "that L also have. Furthermore, B also " @@ -6437,7 +6606,7 @@ msgstr "" "Dans les niveaux de compatibilité 11 et au delà, B offre la " "plupart des fonctionnalités de L. De plus, B " "prend aussi en charge le profil de construction B pour exclure la " -"documentation (quelle que soit le niveau de compatibilité)." +"documentation (quel que soit le niveau de compatibilité)." # type: =item #. type: =item @@ -6598,7 +6767,7 @@ msgid "" msgstr "" "Cherche dans le répertoire indiqué les fichiers à installer. Cette option " "nécessite le niveau de compatibilité 11 ou supérieur (et sera " -"silencieusement ignorée en compat 10 et avant)." +"silencieusement ignorée en version 10 et avant)." #. type: textblock #: dh_installdocs:109 dh_installman:102 @@ -6757,7 +6926,6 @@ msgstr "" #. type: textblock #: dh_installdocs:168 -#, fuzzy #| msgid "" #| "B: The use of B<--link-doc> should only be done when the " #| "packages have same \"architecture\" type. A link from a architecture " @@ -7238,7 +7406,6 @@ msgstr "" # type: textblock #. type: textblock #: dh_installinit:22 -#, fuzzy #| msgid "" #| "B is a debhelper program that is responsible for " #| "installing init scripts with associated defaults files. In compatibility " @@ -7255,8 +7422,11 @@ msgid "" msgstr "" "B est le programme de la suite debhelper chargé de " "l'installation des scripts init avec les fichiers par défaut associés. " -"Jusqu'au niveau de compatibilité 11, B s'occupait aussi des " -"fichiers de tâche upstart et des fichiers de service systemd." +"Jusqu'au niveau de compatibilité 10, B s'occupait aussi de " +"certains fichiers de systemd fournis par l'empaquetage Debian (consultez la " +"section L ci-dessous). Jusqu'au niveau de compatibilité 11, " +"B s'occupait aussi des fichiers de tâche upstart fournis par " +"l'empaquetage Debian (voir aussi L pour plus d'informations)." # type: textblock #. type: textblock @@ -7571,10 +7741,14 @@ msgid "" "as it is the first (functional) version that supports B<< update-rc.d " "EscriptE defaults-disabled >>." msgstr "" +"Désactive le script init lors de la purge, mais ne l'active pas à " +"l'installation. Cette option implique une dépendance versionnée sur B<= 1.51) >> car c'est la première version " +"(fonctionnelle) à prendre en charge B<< update-rc.d EscriptE " +"defaults-disabled >>." #. type: textblock #: dh_installinit:149 -#, fuzzy #| msgid "" #| "B that this option does not affect whether the services are " #| "started. That is controlled by L (using e.g. its " @@ -7584,19 +7758,19 @@ msgid "" "Please remember to also use B<--no-start> if the service should not be " "started." msgstr "" -"B : cette option n'affecte pas le démarrage des services. Cela est " -"contrôlé par L (par exemple en utilisant l'option B<--" -"no-start>)." +"B : cette option n'affecte pas le démarrage des services. Veuillez " +"utiliser B<--no-start> si le service ne doit pas être démarré." # type: =item #. type: textblock #: dh_installinit:153 -#, fuzzy #| msgid "B<-u>I B<--update-rcd-params=>I" msgid "" "Cannot be combined with B<-u>I, B<--update-rcd-params=>I, or " "B<--> I." -msgstr "B<-u>I B<--update-rcd-params=>I" +msgstr "" +"Ne peut pas être combiné à B<-u>I B<--update-rcd-" +"params=>I ou B<--> I." # type: =item #. type: =item @@ -7631,7 +7805,6 @@ msgstr "B<-u>I B<--update-rcd-params=>I" # type: textblock #. type: textblock #: dh_installinit:169 -#, fuzzy #| msgid "" #| "Pass I to L. If not specified, B will " #| "be passed to L." @@ -7641,12 +7814,13 @@ msgid "" "d(8)>." msgstr "" "Passe les I indiqués à L. Si rien n'est indiqué, " -"B sera passé à L." +"B (ou B avec B<--no-enable>) sera passé à " +"L." #. type: textblock #: dh_installinit:173 msgid "Cannot be combined with B<--no-enable>." -msgstr "" +msgstr "Ne peut pas être combiné à B<--no-enable>." # type: textblock #. type: textblock @@ -7720,10 +7894,9 @@ msgstr "" # type: textblock #. type: textblock #: dh_installinit:427 -#, fuzzy #| msgid "L, L" msgid "L, L" -msgstr "L, L" +msgstr "L, L" # type: textblock #. type: textblock @@ -7739,26 +7912,23 @@ msgstr "Michael Stapelberg " # type: textblock #. type: textblock #: dh_installinitramfs:5 -#, fuzzy #| msgid "" #| "dh_installinit - install service init files into package build directories" msgid "dh_installinitramfs - install initramfs hooks and setup maintscripts" msgstr "" -"dh_installinit - Installer les fichiers de service « init » dans le " -"répertoire de construction du paquet" +"dh_installinitramfs - Installer les accroches (hooks) pour initramfs et " +"configurer les scripts de maintenance" # type: textblock #. type: textblock #: dh_installinitramfs:17 -#, fuzzy #| msgid "B [S>] [B<-n>]" msgid "B [S>] [B<-n>]" -msgstr "B [B] [B<-n>]" +msgstr "B [B] [B<-n>]" # type: textblock #. type: textblock #: dh_installinitramfs:21 -#, fuzzy #| msgid "" #| "B is a debhelper program that is responsible for " #| "installing mime files into package build directories." @@ -7766,14 +7936,13 @@ msgid "" "B is a debhelper program that is responsible for " "installing Debian package provided initramfs hooks." msgstr "" -"B est le programme de la suite debhelper chargé de " -"l'installation des fichiers « mime » dans le répertoire de construction du " -"paquet." +"B est le programme de la suite debhelper chargé de " +"l'installation des accroches (hooks) pour initramfs fournies par le paquet " +"Debian." # type: textblock #. type: textblock #: dh_installinitramfs:24 -#, fuzzy #| msgid "" #| "It also automatically generates the F and F commands " #| "needed to interface with the Debian B package. These commands are " @@ -7785,18 +7954,19 @@ msgid "" "initramfs system. These commands are inserted into the maintainer scripts " "by L." msgstr "" -"De plus, il produit automatiquement les lignes de code des scripts de " -"maintenance F et F nécessaires à l'interfaçage avec le " -"paquet B de Debian. Ces commandes sont insérées dans les scripts de " -"maintenance par L." +"Si B installe ou (à partir de la version 12) détecte " +"une ou plusieurs accroches pour initramfs dans le paquet, il produit " +"automatiquement les lignes de code des scripts de maintenance F et " +"F nécessaires à l'interfaçage avec le système initramfs de Debian. " +"Ces commandes sont insérées dans les scripts de maintenance par " +"L." # type: =item #. type: =item #: dh_installinitramfs:34 -#, fuzzy #| msgid "debian/I.init" msgid "debian/I.initramfs-hook" -msgstr "debian/I.init" +msgstr "debian/I.initramfs-hook" #. type: textblock #: dh_installinitramfs:36 @@ -7806,6 +7976,10 @@ msgid "" "B in L for more information about " "initramfs hooks." msgstr "" +"Considéré comme une accroche pour initramfs qui sera installée dans F<< usr/" +"share/initramfs-tools/hooks/I >> dans le répertoire de construction " +"du paquet. Consultez B dans L pour plus " +"d'information à ce sujet." # type: textblock #. type: textblock @@ -7818,10 +7992,9 @@ msgstr "" # type: textblock #. type: textblock #: dh_installinitramfs:87 -#, fuzzy #| msgid "L L L" msgid "L L L" -msgstr "L L L" +msgstr "L L L" # type: textblock #. type: textblock @@ -7998,8 +8171,8 @@ msgid "" msgstr "" "Jusqu'au niveau de compatibilité 10, ce programme était utilisé " "principalement lorsque le système de construction amont ne les installait " -"pas correctement lors de la phase d'installation. En compat 11 et " -"postérieurs, il prend en charge les mêmes fonctionnalités que " +"pas correctement lors de la phase d'installation. En version 11 et " +"postérieures, il prend en charge les mêmes fonctionnalités que " "L et a l'avantage de respecter le profil B " "(contrairement à L)." @@ -8087,7 +8260,7 @@ msgid "" msgstr "" "Après l'étape d'installation des pages de manuel, B vérifie " "si des pages de manuel, contenues dans les répertoires temporaires des " -"paquets traités, contiennent des liens F<.so>. Dans ce cas il les transforme " +"paquets traités, contiennent des liens F<.so>. Dans ce cas, il les transforme " "en liens symboliques." # type: textblock @@ -8271,7 +8444,7 @@ msgid "" "symlinks." msgstr "" "Après l'étape d'installation des pages de manuel, B " -"vérifie si des pages de manuel contiennent des liens F<.so>. Dans ce cas il " +"vérifie si des pages de manuel contiennent des liens F<.so>. Dans ce cas, il " "les transforme en liens symboliques." # type: textblock @@ -8768,7 +8941,7 @@ msgid "" msgstr "" "Fixe la priorité du gestionnaire de fenêtres. La valeur par défaut est de " "B<20>, ce qui est trop peu pour la plupart des gestionnaires de fenêtres. " -"Voir la Charte Debian sur la méthode de détermination de la valeur adéquate." +"Voir la Charte Debian sur la méthode de détermination de la valeur adéquate." # type: textblock #. type: textblock @@ -8782,7 +8955,6 @@ msgstr "" # type: textblock #. type: textblock #: dh_installwm:54 -#, fuzzy #| msgid "" #| "Create any links specified by command line parameters in ALL packages " #| "acted on, not just the first." @@ -8790,8 +8962,9 @@ msgid "" "Modify scripts for window managers specified by command line parameters in " "ALL packages acted on, not just the first." msgstr "" -"Crée les liens symboliques indiqués en paramètres dans B les paquets " -"et pas seulement dans le premier paquet construit." +"Modifie les scripts pour les gestionnaires de fenêtres indiqués en " +"paramètres dans B les paquets et pas seulement dans le premier paquet " +"construit." # type: =item #. type: =item @@ -8892,7 +9065,7 @@ msgid "" "See Debian policy, section 11.8.5. for details about doing fonts the Debian " "way." msgstr "" -"Consulter la Charte Debian, section 11.8.5, pour les détails sur la gestion " +"Consulter la Charte Debian, section 11.8.5, pour les détails sur la gestion " "des polices de caractères sous Debian." # type: textblock @@ -8961,7 +9134,7 @@ msgid "" "path as possible. It will also create any subdirectories it needs to put the " "symlinks in." msgstr "" -"B produit des liens symboliques conformes à la Charte Debian : " +"B produit des liens symboliques conformes à la Charte Debian : " "absolus lorsque la Charte indique qu'ils doivent l'être et relatifs, avec un " "chemin aussi court que possible, dans les autres cas. B crée " "également tous les sous-répertoires nécessaires à l'installation des liens " @@ -8983,7 +9156,7 @@ msgid "" msgstr "" "De plus, B scrute le répertoire de construction du paquet pour " "trouver (et corriger à partir de la v4 seulement) les liens symboliques non " -"conformes à la Charte Debian." +"conformes à la Charte Debian." # type: =item #. type: =item @@ -9005,7 +9178,6 @@ msgstr "" #. type: textblock #: dh_link:56 -#, fuzzy #| msgid "" #| "In each pair the source file (called B by L) comes first " #| "and is followed by the destination file (called B by " @@ -9050,7 +9222,7 @@ msgid "" msgstr "" "Exclut les liens symboliques qui comportent I<élément>, n'importe où dans " "leur nom, alors qu'ils auraient dû être corrigés pour se conformer à la " -"charte Debian." +"Charte Debian." # type: =item #. type: =item @@ -9232,14 +9404,13 @@ msgstr "" # type: textblock #. type: textblock #: dh_listpackages:26 -#, fuzzy #| msgid "" #| "These files are installed into the first binary package listed in debian/" #| "control." msgid "Packages are listed in the order they appear in F." msgstr "" -"Ces fichiers sont installés dans le premier paquet binaire listé dans " -"F." +"Les paquets sont indiqués dans le même ordre que dans le fichier F." # type: textblock #. type: textblock @@ -9376,6 +9547,8 @@ msgid "" "If a shlibs file is generated by this program, this option controls what " "version will be used in the dependency relation." msgstr "" +"Si un fichier shlibs est créé par ce programme, cette option contrôle quelle " +"version sera utilisée dans la relation de dépendance." #. type: textblock #: dh_makeshlibs:70 @@ -9383,16 +9556,18 @@ msgid "" "In compat 12 and later, B defaults to B<-VUpstream-Version>. " "In compat 11 and earlier the default behaved like B<-VNone>.." msgstr "" +"Depuis la version 12, B utilise B<-VUpstream-Version> par " +"défaut. Jusqu'à la version 11, le comportement par défaut imitait B<-VNone>." #. type: textblock #: dh_makeshlibs:73 msgid "The B tool can generate dependencies in three variants:" -msgstr "" +msgstr "B peut générer des dépendances de trois façons." #. type: =item #: dh_makeshlibs:77 msgid "B<-VUpstream-Version>" -msgstr "" +msgstr "B<-VUpstream-Version>" #. type: textblock #: dh_makeshlibs:79 @@ -9401,11 +9576,13 @@ msgid "" "Note that I is case-sensitive and must be written exactly " "as shown here." msgstr "" +"La dépendance sera de la forme « I B<(E>= IB<)> ». " +"I est sensible à la casse est doit être écrit exactement " +"comme cela." # type: textblock #. type: textblock #: dh_makeshlibs:83 -#, fuzzy #| msgid "" #| "Beware of using B<-V> without any parameters; this is a conservative " #| "setting that always ensures that other packages' shared library " @@ -9420,14 +9597,10 @@ msgid "" "the library is prone to changing ABI without updating the upstream version " "number)." msgstr "" -"L'usage de B<-V> sans paramètre est risqué. C'est une disposition " -"conservatoire qui garantit que les dépendances des autres paquets envers la " -"bibliothèque partagée sont aussi strictes qu'elles le doivent (à moins que " -"la bibliothèque soit sujette à des changements d'ABI sans mise à jour des " -"numéros de version amont). De cette manière, si le responsable du paquet " -"cafouille, les autres paquets ne seront pas cassés. Le risque est que les " -"paquets pourraient finir par avoir des dépendances tellement strictes qu'il " -"serait difficile de les mettre à jour." +"C'est une disposition conservatoire qui garantit que les dépendances des " +"autres paquets envers la bibliothèque partagée sont aussi strictes qu'elles " +"le doivent (à moins que la bibliothèque soit sujette à des changements d'ABI " +"sans mise à jour des numéros de version amont)." #. type: textblock #: dh_makeshlibs:88 @@ -9437,6 +9610,11 @@ msgid "" "often of minor temporary inconvenience and usually a lot better than the " "fall out caused by forgetting to bump the dependency information." msgstr "" +"Le revers de cela est que les paquets pourraient avoir des dépendances qui " +"sont trop restreintes (mais un fichier de symboles peut atténuer le " +"problème). Ce n'est souvent qu'un inconvénient mineur et temporaire, " +"préférable à un échec dû à l'oubli de la mise à jour d'une information de " +"dépendance." #. type: textblock #: dh_makeshlibs:94 @@ -9445,14 +9623,16 @@ msgid "" "V> without any dependency information was used instead (and that form still " "works)" msgstr "" +"Ce format explicite a été ajouté à debhelper/11.3. Dans les versions " +"précédentes, une option B<-V> sans aucune information de dépendance était " +"utilisée (ce qui fonctionne toujours)." # type: =item #. type: =item #: dh_makeshlibs:98 -#, fuzzy #| msgid "B<-V>" msgid "B<-VNone>" -msgstr "B<-V>" +msgstr "B<-VNone>" #. type: textblock #: dh_makeshlibs:100 @@ -9460,6 +9640,8 @@ msgid "" "The dependency will be \"I\". Note that I is case-" "sensitive and must be written exactly as shown here." msgstr "" +"La dépendance sera de la forme « I ». I est sensible à la " +"casse est doit être écrit exactement comme cela." #. type: textblock #: dh_makeshlibs:103 @@ -9469,6 +9651,10 @@ msgid "" "interfaces over time and packagers are recommended to use B<-VUpstream-" "Version> (or one of the other forms of B<-V>I)." msgstr "" +"Ce format n'est pas sécurisé, sauf si l'amont ne modifie pas son ABI " +"d'aucune façon. Cependant, la plupart des équipes amont améliorent leurs " +"interfaces au cours du temps, et il est recommandé d'utiliser B<-VUpstream-" +"Version> (ou l'une des autres formes de B<-V>I)." #. type: textblock #: dh_makeshlibs:108 @@ -9478,14 +9664,18 @@ msgid "" "packages. Note that symbols are not supported for udeb packages, which " "solely relies on shlibs for dependency handling." msgstr "" +"Par ailleurs, cela pourrait être suffisant si (et seulement si) le paquet " +"utilise le versionnement des symboles (voir L) et ne " +"produit I paquet udeb. Les symboles ne sont pas pris en charge pour " +"les paquets udeb, qui ne s'appuient que sur shlibs pour la gestion des " +"dépendances." # type: =item #. type: =item #: dh_makeshlibs:113 -#, fuzzy #| msgid "B<--ddeb-migration=>I" msgid "B<-V>I" -msgstr "B<--ddeb-migration=>I" +msgstr "B<-V>I" #. type: textblock #: dh_makeshlibs:115 @@ -9495,6 +9685,9 @@ msgid "" "package-name> B<(E>= IB<)>\". Remember to include " "the package name." msgstr "" +"Dans ce cas, la valeur donnée à B<-V> sera utilisée comme une relation de " +"dépendance. I devrait être de la forme « I " +"B<(E>= IB<)> ». N'oubliez pas d'inclure le nom de paquet." #. type: textblock #: dh_makeshlibs:120 @@ -9503,6 +9696,10 @@ msgid "" "or modification. In I cases, this is needed to generate a " "dependency on a different package than the one containing the library." msgstr "" +"Veuillez noter que debhelper utilisera la valeur I sans " +"vérification de propreté ni de modification. Dans de I cas, cela est " +"nécessaire pour générer une dépendance sur un paquet différent que celui qui " +"contient la bibliothèque." #. type: textblock #: dh_makeshlibs:127 @@ -9512,6 +9709,10 @@ msgid "" "file for regular .deb packages. See L for more " "information on this topic." msgstr "" +"Au moment de choisir une valeur pour cette option, gardez à l'esprit que si " +"le paquet fournit un fichier de symboles, ce dernier est souvent préféré au " +"fichier shlibs pour les paquets .deb habituels. Consultez L pour plus d'informations sur ce sujet." #. type: textblock #: dh_makeshlibs:134 @@ -9563,10 +9764,9 @@ msgstr "Fournit I à L." # type: =item #. type: =item #: dh_makeshlibs:159 -#, fuzzy #| msgid "B" msgid "B" -msgstr "B" +msgstr "B" # type: verbatim #. type: verbatim @@ -9586,10 +9786,9 @@ msgstr "" # type: =item #. type: =item #: dh_makeshlibs:165 -#, fuzzy #| msgid "B" msgid "B" -msgstr "B" +msgstr "B" # type: verbatim #. type: verbatim @@ -9823,7 +10022,7 @@ msgid "" msgstr "" "Nota : Les fichiers sont, par défaut, toujours déplacés depuis F " "(même s'il a été demandé à debhelper d'utiliser un niveau de compatibilité " -"supérieur à 1, ce qui induit que debian/tmp n'est utilisé pour rien " +"supérieur à 1, ce qui induit que debian/tmp n'est utilisé pour rien " "d'autre). L'idée sous-jacente est que le paquet en construction peut " "s'installer dans F, et qu'alors les fichiers peuvent être " "déplacés par B à partir de là. Tous les fichiers ou " @@ -10181,7 +10380,7 @@ msgid "" msgstr "" "Supposons que le paquet source produise les paquets binaires libtoto1, " "libtoto-dev et libtoto-bin. libtoto-bin utilise la bibliothèque libtoto1 et " -"doit donc en dépendre. Dans le fichier rules, il faut d'abord exécuter " +"doit donc en dépendre. Dans le fichier F, il faut d'abord exécuter " "B puis B :" # type: verbatim @@ -10245,7 +10444,7 @@ msgstr "L, L" msgid "" "dh_strip - strip executables, shared libraries, and some static libraries" msgstr "" -"dh_strip - Dépouiller les exécutables, les bibliothèques partagées, et " +"dh_strip - Dépouiller les exécutables, les bibliothèques partagées et " "certaines bibliothèques statiques" # type: textblock @@ -10388,7 +10587,7 @@ msgid "" "This option implies B<--no-automatic-dbgsym> and I be used with B<--" "automatic-dbgsym>." msgstr "" -"Cett option implique B<--no-automatic-dbgsym> et ne peut B être " +"Cette option implique B<--no-automatic-dbgsym> et ne peut B être " "utilisée avec B<--ddebs>." # type: =item @@ -10500,7 +10699,7 @@ msgid "" "symbol packages." msgstr "" "Si la variable d'environnement B contient B, " -"rien ne sera dépouillé, conformément à la Charte Debian (section 10.1 " +"rien ne sera dépouillé, conformément à la Charte Debian (section 10.1 " "« Binaries »). Cela empêchera aussi la création automatique des paquets de " "symboles de débogage." @@ -10518,7 +10717,7 @@ msgstr "" "empêchée en ajoutant B à la variable d'environnement " "B. En revanche, B ajoutera quand même les liens " "de débogage aux binaires ELF lorsque ce paramètre est défini, pour s'assurer " -"que le paquet deb soit identique avec ou sans (en considérant qu'il est par " +"que le paquet deb est identique avec ou sans (en considérant qu'il est par " "ailleurs reproductible bit à bit)." # type: textblock @@ -10582,6 +10781,8 @@ msgid "" "B is used to determine if the target is being run with " "sufficient access to (fake)root." msgstr "" +"B est utilisé pour déterminer si la cible est exécutée avec des " +"accès suffisants à (fake)root." #. type: textblock #: dh_testroot:18 @@ -10593,6 +10794,12 @@ msgid "" "the builder followed the minimum requirements for the given value of " "I." msgstr "" +"La définition des accès suffisants dépend de comment le constructeur (celui " +"qui appelle la cible F) gère le champ I (R³). Si le constructeur prend en charge R³, il positionnera la " +"variable d'environnement I et B " +"validera que le constructeur suit les recommandations minimales pour la " +"valeur donnée de I." #. type: textblock #: dh_testroot:25 @@ -10602,6 +10809,10 @@ msgid "" "B (and the rest of debhelper) fall back to assuming that " "(fake)root is implied." msgstr "" +"Si le constructeur ne prend pas en charge I, il ne " +"positionnera pas la variable d'environnement I. " +"Cela conduira B (et le reste de debhelper) à considérer que " +"(fake)root est impliqué." #. type: textblock #: dh_testroot:30 @@ -10610,18 +10821,21 @@ msgid "" "I environment variable (leading and trailing " "whitespace in the variable is ignored)." msgstr "" +"Ce qui suit est un résumé du comportement de B en fonction de " +"la variable d'environnement I (les espaces de début " +"et de fin dans la variable sont ignorées)." #. type: textblock #: dh_testroot:38 -#, fuzzy #| msgid "" #| "B asserts that it is run as root or under L." msgid "" "If unset, or set to C, then B asserts that it " "is run as root or under L." msgstr "" -"B suppose qu'il est exécuté en tant que superutilisateur, ou " -"dans L." +"Si la variable n'existe pas ou vaut C, B " +"suppose qu'il est exécuté en tant que superutilisateur ou dans " +"L." #. type: textblock #: dh_testroot:43 @@ -10629,10 +10843,11 @@ msgid "" "If set to C, then B returns successfully (without " "performing any additional checks)." msgstr "" +"Si la variable vaut C, B se terminera avec succès (sans " +"effectuer d'autres vérifications)." #. type: textblock #: dh_testroot:48 -#, fuzzy #| msgid "" #| "B asserts that it is either run as root (or under " #| "L) or the builder has provided the B " @@ -10643,10 +10858,10 @@ msgid "" "provided the B environment variable (e.g. via dpkg-" "buildpackage -r)." msgstr "" -"B suppose qu'il est exécuté en tant que superutilisateur (ou " -"dans L), ou que le constructeur a fourni la variable " -"d'environnement B (par exemple grâce à dpkg-" -"buildpackage -r)." +"Si la variable a une autre valeur que celles précédentes, B " +"suppose qu'il est exécuté en tant que superutilisateur (ou dans " +"L), ou que le constructeur a fourni la variable d'environnement " +"B (par exemple grâce à dpkg-buildpackage -r)." #. type: textblock #: dh_testroot:55 @@ -10657,6 +10872,12 @@ msgid "" "enables things like testing for what will happen when " "I is set to a given value." msgstr "" +"Veuillez noter que B ne lit I le champ " +"I. Cela implique que B pourrait produire " +"des résultats incorrects si le constructeur ment à " +"I. D'un autre côté, cela permet aussi des choses " +"comme le test de fonctionnement lorsque I est " +"positionné à une certaine valeur." # type: textblock #. type: textblock @@ -10701,7 +10922,7 @@ msgstr "" "du paquet (sauf si B<-n> est utilisé) afin de créer ces répertoires au " "moment de l'installation. Il génère également les lignes de code pour " "supprimer ces répertoires lorsque le paquet est enlevé, conformément à la " -"Charte Debian. Ces lignes de codes sont ajoutées aux scripts de maintenance " +"Charte Debian. Ces lignes de codes sont ajoutées aux scripts de maintenance " "du paquet par B. Voir L pour une " "explication sur l'ajout des lignes de code aux scripts de maintenance du " "paquet." @@ -10713,6 +10934,9 @@ msgid "" "(effectively) I, the directories in F will be " "handled as if they were owned by root:root (see below)." msgstr "" +"Lorsque la variable d'environnement I n'est pas " +"égale à I, les répertoires dans F sont traités " +"comme s'ils appartenaient à root:root (voir ci-dessous)." #. type: textblock #: dh_usrlocal:40 @@ -10721,6 +10945,9 @@ msgid "" "value of I, the owners, groups and permissions will be " "preserved with the sole exception where the directory is owned by root:root." msgstr "" +"Lorsque la variable d'environnement I vaut C, le propriétaire, les groupes et les permissions seront conservés, " +"sauf si le répertoire appartient à root:root." #. type: textblock #: dh_usrlocal:44 @@ -10731,6 +10958,11 @@ msgid "" "the system has F (as documented in the " "Debian Policy Manual §9.1.2 since version 4.1.4)" msgstr "" +"Si un répertoire appartient à root:root, le propriétaire sera déterminé à " +"l'installation. Le propriétaire et les permissions seront fixés à root:root " +"en mode 0755, ou à root:staff en mode 02775. Le choix effectif dépend " +"de la présence du fichier F (comme documenté " +"dans la Charte Debian, §9.1.2, depuis la version 4.1.4)." # type: textblock #. type: textblock @@ -10956,7 +11188,7 @@ msgstr "" "Installe le fichier service en utilisant le I indiqué au lieu " "du nom I par défaut. Quand ce paramètre est employé, " "B recherche et installe le fichier appelé F, au lieu du F habituel." +"nom.service> au lieu du F habituel." # type: textblock #. type: textblock -- cgit v1.2.3 From b217bd50f8cdc47bd78c25683708cc751ecff082 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 10 Feb 2019 20:33:47 +0000 Subject: Bump S-V to 4.3.0 - no changes required Signed-off-by: Niels Thykier --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f7831680..f15e241b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ debhelper (12.1) UNRELEASED; urgency=medium helpers can may dh_missing ignore paths that are not installed. Thanks to Hilko Bengen for reporting the original documentation was unsufficient. (Closes: #917362) + * d/control: Bump Standards-Version to 4.3.0 - no changes required. [ Baptiste Jammet ] * fr.po: Update French translation. (Closes: #921254) diff --git a/debian/control b/debian/control index 0ba40652..2ebf8d01 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: dpkg-dev (>= 1.18.0~), perl:any, po4a, Rules-Requires-Root: no -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 Testsuite: autopkgtest-pkg-perl Vcs-Git: https://salsa.debian.org/debian/debhelper.git Vcs-Browser: https://salsa.debian.org/debian/debhelper -- cgit v1.2.3 From b2c1560546c5327a33a84c1bd2d3710d4d447db8 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 10 Feb 2019 20:36:28 +0000 Subject: Release debhelper/12.1 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f15e241b..3b314c4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.1) UNRELEASED; urgency=medium +debhelper (12.1) unstable; urgency=medium [ Xavier Guimard ] * dh_fixperms: add .node in mode_0644_patterns. @@ -26,7 +26,7 @@ debhelper (12.1) UNRELEASED; urgency=medium [ Baptiste Jammet ] * fr.po: Update French translation. (Closes: #921254) - -- Niels Thykier Fri, 04 Jan 2019 18:27:58 +0100 + -- Niels Thykier Sun, 10 Feb 2019 20:33:53 +0000 debhelper (12) unstable; urgency=medium -- cgit v1.2.3 From aeb5628b7276be04ce6dcfd8ff78fe497a367a48 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 23 Feb 2019 07:42:39 +0000 Subject: dh_installinitramfs: Install hooks as executable files Signed-off-by: Niels Thykier --- debian/changelog | 8 ++++++++ dh_installinitramfs | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3b314c4a..3bf2ddec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (12.2) UNRELEASED; urgency=medium + + * dh_installinitramfs: Install hooks as executable rather than + plan files. Thanks to Thorsten Glaser for the report. + (Closes: #922990) + + -- Niels Thykier Sat, 23 Feb 2019 07:40:46 +0000 + debhelper (12.1) unstable; urgency=medium [ Xavier Guimard ] diff --git a/dh_installinitramfs b/dh_installinitramfs index 7d962666..7cfb1cbb 100755 --- a/dh_installinitramfs +++ b/dh_installinitramfs @@ -70,7 +70,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if ($hook_script ne '') { install_dir($hook_dir); - install_file($hook_script, "${hook_dir}/${package}"); + install_prog($hook_script, "${hook_dir}/${package}"); $has_hooks = 1; } elsif (-d $hook_dir and not is_empty_dir($hook_dir)) { $has_hooks = 1; -- cgit v1.2.3 From 2b14bbd185f5dc3f302bccf79225e486ae271167 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 23 Feb 2019 11:26:30 +0000 Subject: dh_compress: Avoid compressing examples shipped for the doc-main package Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_compress | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3bf2ddec..5d977670 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ debhelper (12.2) UNRELEASED; urgency=medium * dh_installinitramfs: Install hooks as executable rather than plan files. Thanks to Thorsten Glaser for the report. (Closes: #922990) + * dh_compress: Fix bug where examples where compressed when a + doc package shipped examples for another package. Thanks to + Christian Kastner for reporting this. (Closes: #922267) -- Niels Thykier Sat, 23 Feb 2019 07:40:46 +0000 diff --git a/dh_compress b/dh_compress index abba978d..d801d833 100755 --- a/dh_compress +++ b/dh_compress @@ -91,7 +91,12 @@ on_pkgs_in_parallel { # structure that will be effected. next unless -d $tmp; my $ignore_doc_dirs = '-name _sources'; - $ignore_doc_dirs .= qq{ -o -path "usr/share/doc/$package/examples"} if not compat(11); + if (not compat(11)) { + my $target_package = compute_doc_main_package($package); + $ignore_doc_dirs .= qq{ -o -path "usr/share/doc/${package}/examples"}; + $ignore_doc_dirs .= qq{ -o -path "usr/share/doc/${target_package}/examples"} + if $target_package and $target_package ne $package; + } $olddir = getcwd() if not defined $olddir; verbose_print("cd $tmp"); chdir($tmp) || error("Can't cd to $tmp: $!"); -- cgit v1.2.3 From 87e0faaeaa13c5d6a2f30f7d922a96a8984ab646 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 23 Feb 2019 14:01:08 +0000 Subject: Release debhelper/12.1.1 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5d977670..a9abcf1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.2) UNRELEASED; urgency=medium +debhelper (12.1.1) unstable; urgency=medium * dh_installinitramfs: Install hooks as executable rather than plan files. Thanks to Thorsten Glaser for the report. @@ -7,7 +7,7 @@ debhelper (12.2) UNRELEASED; urgency=medium doc package shipped examples for another package. Thanks to Christian Kastner for reporting this. (Closes: #922267) - -- Niels Thykier Sat, 23 Feb 2019 07:40:46 +0000 + -- Niels Thykier Sat, 23 Feb 2019 13:24:47 +0000 debhelper (12.1) unstable; urgency=medium -- cgit v1.2.3 From ba2ec857e49da223589731d5c503c0c9b83c8b5d Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 24 Feb 2019 11:38:30 +0000 Subject: d/changelog: Fix bug number Signed-off-by: Niels Thykier --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a9abcf1c..2526061d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ debhelper (12.1.1) unstable; urgency=medium (Closes: #922990) * dh_compress: Fix bug where examples where compressed when a doc package shipped examples for another package. Thanks to - Christian Kastner for reporting this. (Closes: #922267) + Christian Kastner for reporting this. (Closes: #922795) -- Niels Thykier Sat, 23 Feb 2019 13:24:47 +0000 -- cgit v1.2.3 From 5e2f5a7777cffe4bc7a89fa20dc958954aeda809 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 25 Feb 2019 07:22:44 +0000 Subject: Dh_Lib: Ensure error uses a well-defined stable error code Signed-off-by: Niels Thykier --- debian/changelog | 8 ++++++++ lib/Debian/Debhelper/Dh_Lib.pm | 5 +++-- t/dh_missing/02-fail-on-missing.t | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2526061d..ae1f6870 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (12.1.2) UNRELEASED; urgency=medium + + * Dh_Lib: Ensure the error function always triggers the same + exit code on termination. Previously, it depended on the + value of the last error (if any). + + -- Niels Thykier Mon, 25 Feb 2019 07:23:03 +0000 + debhelper (12.1.1) unstable; urgency=medium * dh_installinitramfs: Install hooks as executable rather than diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm index 00703214..c707197c 100644 --- a/lib/Debian/Debhelper/Dh_Lib.pm +++ b/lib/Debian/Debhelper/Dh_Lib.pm @@ -761,8 +761,9 @@ sub nonquiet_print { # Output an error message and die (can be caught). sub error { - my $message=shift; - + my ($message) = @_; + # ensure the error code is well defined. + $! = 255; die basename($0).": $message\n"; } diff --git a/t/dh_missing/02-fail-on-missing.t b/t/dh_missing/02-fail-on-missing.t index 711ed984..e97b6eba 100755 --- a/t/dh_missing/02-fail-on-missing.t +++ b/t/dh_missing/02-fail-on-missing.t @@ -28,6 +28,6 @@ each_compat_subtest { isnt($?, -1, 'dh_missing was executed'); ok(! ($? & 127), 'dh_missing did not die due to a signal'); my $exitcode = ($? >> 8); - is($exitcode, 2, 'dh_missing exited with exit code 2'); + is($exitcode, 255, 'dh_missing exited with exit code 255'); }; -- cgit v1.2.3 From 10202ad96b99a1e357b5d11d2dad549ae198fbad Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 17 May 2019 19:40:51 +0000 Subject: Add changelog for recent build system changes Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ae1f6870..d94abfd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ debhelper (12.1.2) UNRELEASED; urgency=medium * Dh_Lib: Ensure the error function always triggers the same exit code on termination. Previously, it depended on the value of the last error (if any). + * Buildsystem/make: Fix regression where cross-flags were + passed in a non-cross build. (Closes: #925175) -- Niels Thykier Mon, 25 Feb 2019 07:23:03 +0000 -- cgit v1.2.3 From bc0cc3204fd919e362e35f18b7df9547f37d30ce Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Fri, 17 May 2019 19:41:39 +0000 Subject: cmake.pm: Emit correct CMAKE_SYSTEM_PROCESSOR for mips64el during cross builds Signed-off-by: Niels Thykier --- debian/changelog | 5 +++++ lib/Debian/Debhelper/Buildsystem/cmake.pm | 1 + 2 files changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d94abfd1..9e40c973 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ debhelper (12.1.2) UNRELEASED; urgency=medium + [ Niels Thykier ] * Dh_Lib: Ensure the error function always triggers the same exit code on termination. Previously, it depended on the value of the last error (if any). * Buildsystem/make: Fix regression where cross-flags were passed in a non-cross build. (Closes: #925175) + [ Helmut Grohne ] + * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. + (Closes: #926815) + -- Niels Thykier Mon, 25 Feb 2019 07:23:03 +0000 debhelper (12.1.1) unstable; urgency=medium diff --git a/lib/Debian/Debhelper/Buildsystem/cmake.pm b/lib/Debian/Debhelper/Buildsystem/cmake.pm index ee8abb26..1d5bd1a9 100644 --- a/lib/Debian/Debhelper/Buildsystem/cmake.pm +++ b/lib/Debian/Debhelper/Buildsystem/cmake.pm @@ -27,6 +27,7 @@ my %DEB_HOST2CMAKE_SYSTEM = ( ); my %GNU_CPU2SYSTEM_PROCESSOR = ( + 'mips64el' => 'mips64', 'powerpc64le' => 'ppc64le', ); -- cgit v1.2.3 From 32f1e3b5150dc893300a4fa74af51a4e23eb9915 Mon Sep 17 00:00:00 2001 From: Américo Monteiro Date: Fri, 17 May 2019 19:53:42 +0000 Subject: Update on Portuguese translation of manpage --- debian/changelog | 4 + man/po4a/po/pt.po | 540 +++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 396 insertions(+), 148 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9e40c973..a27f20bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ debhelper (12.1.2) UNRELEASED; urgency=medium * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. (Closes: #926815) + [ Translations ] + * Update Portuguese translation (Américo Monteiro) (Closes: #886279) + + -- Niels Thykier Mon, 25 Feb 2019 07:23:03 +0000 debhelper (12.1.1) unstable; urgency=medium diff --git a/man/po4a/po/pt.po b/man/po4a/po/pt.po index e6ba74dd..efbaa9dd 100644 --- a/man/po4a/po/pt.po +++ b/man/po4a/po/pt.po @@ -2,13 +2,13 @@ # Copyright (C) 2014 The debhelper's copyright holder. # This file is distributed under the same license as the debhelper package. # -# Américo Monteiro , 2014 - 2017. +# Américo Monteiro , 2014 - 2019. msgid "" msgstr "" -"Project-Id-Version: debhelper 10.10.10\n" +"Project-Id-Version: debhelper 12.1.1\n" "Report-Msgid-Bugs-To: debhelper@packages.debian.org\n" "POT-Creation-Date: 2019-02-09 17:11+0100\n" -"PO-Revision-Date: 2017-12-06 00:26+0000\n" +"PO-Revision-Date: 2019-04-18 22:49+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese <>\n" "Language: pt\n" @@ -140,7 +140,6 @@ msgstr "" #. type: textblock #: debhelper.pod:31 -#, fuzzy #| msgid "" #| "Except where tool explicitly denotes otherwise, all of the debhelper " #| "tools assumes that they run from root directory of an unpacked source " @@ -154,7 +153,7 @@ msgstr "" "Excepto onde a ferramenta explicitamente denota, caso contrário, todas as " "ferramentas do debhelper assumem que são corridas a partir do directório " "raiz de um pacote fonte descompactado. Isto é feito para que possam " -"localizar e encontrar F e F quando necessário." +"localizar e encontrar ficheiros como F quando necessário." #. type: =head1 #: debhelper.pod:36 @@ -256,6 +255,13 @@ msgid "" "by default installs in every binary package when it does not have a package " "prefix (such as F or F)." msgstr "" +"Nota para o primeiro (ou único) pacote binário listado em F, " +"o debhelper irá usar F quando não existe nenhum ficheiro " +"F.foo>. No entanto, é geralmente uma boa ideia manter o " +"prefixo F.> pois é mais explícito. A principal excepção a isto " +"são ficheiro que o debhelper instala por predefinição em todos os pacotes " +"binários quando não tem um prefixo de pacote (tal como F " +"ou F)." #. type: textblock #: debhelper.pod:87 @@ -299,13 +305,14 @@ msgid "" "The syntax of these files is intentionally kept very simple to make them " "easy to read, understand, and modify." msgstr "" +"A sintaxe destes ficheiros é mantida intencionalmente muito simples para " +"os tornar fáceis de ler, compreender e modificar." #. type: =head2 #: debhelper.pod:104 -#, fuzzy #| msgid "Comments are ignored in debhelper config files." msgid "Executable debhelper config files" -msgstr "Comentários são ignorados nos ficheiros de configuração do debhelper." +msgstr "Ficheiros de configuração do debhelper executáveis." #. type: textblock #: debhelper.pod:106 @@ -313,6 +320,9 @@ msgid "" "If you need additional flexibility, many of the debhelper tools (e.g. " "L) support executing a config file as a script." msgstr "" +"Se precisar de flexibilidade adicional, muitas das ferramentas debhelper " +"(ex, L) suportam executar um ficheiro de configuração como " +"um script." #. type: textblock #: debhelper.pod:109 @@ -323,6 +333,12 @@ msgid "" "exec(1)> as interpreter of the config file to retain most of the original " "syntax while getting the additional flexibility you need." msgstr "" +"Para usar esta funcionalidade, simplesmente marque o ficheiro de configuração " +"como executável (ex. B<< chmod +x debian/I.install >>) e a " +"ferramenta irá tentar executá-lo e usar o resultado do script. Em muitos " +"casos, você pode usar L como interpretador do ficheiro de " +"configuração para reter a maioria da sintaxe original enquanto obtém a " +"flexibilidade adicional que precisa." #. type: textblock #: debhelper.pod:117 @@ -330,6 +346,8 @@ msgid "" "When using executable debhelper config files, please be aware of the " "following:" msgstr "" +"Quando usar ficheiros de configuração executáveis do debhelper, por favor " +"tenha em atenção o seguinte:" #. type: =item #: debhelper.pod:122 debhelper.pod:127 @@ -342,6 +360,8 @@ msgid "" "The executable config file B exit with success (i.e. its return code " "should indicate success)." msgstr "" +"O ficheiro de configuração executável B termina com sucesso (isto é, " +"o seu código de retorne deve indicar sucesso)." #. type: textblock #: debhelper.pod:129 @@ -349,6 +369,9 @@ msgid "" "The output will be used exactly as it is. Notably, debhelper will I " "expand wildcards or strip comments in the output." msgstr "" +"O resultado de saída irá ser usado exactamente como está. De notar que " +"o debhelper I irá expandir wildcards ou retirar comentários ao " +"resultado de saída." #. type: textblock #: debhelper.pod:134 @@ -357,6 +380,9 @@ msgid "" "the executable bit, then you can use L and its B " "script." msgstr "" +"Se precisar que o pacote compile num sistema de ficheiros onde não pode " +"desactivar o bit de executável, então você pode usar L o o seu " +"script B." #. type: =head1 #: debhelper.pod:138 @@ -448,10 +474,9 @@ msgstr "Alias descontinuado de B<-a>." #. type: textblock #: debhelper.pod:171 dh_install:77 dh_install:86 -#, fuzzy #| msgid "The option is removed in compat 12." msgid "This option is removed in compat 12." -msgstr "A opção foi removida no nível de compatibilidade 12." +msgstr "Esta opção foi removida no nível de compatibilidade 12." #. type: =item #: debhelper.pod:173 @@ -600,7 +625,6 @@ msgstr "B<-X>I, B<--exclude=>I" #. type: textblock #: debhelper.pod:230 -#, fuzzy #| msgid "" #| "Exclude an item from processing. This option may be used multiple times, " #| "to exclude more than one thing. The \\fIitem\\fR is typically part of a " @@ -611,7 +635,7 @@ msgid "" "and any file containing the specified text will be excluded." msgstr "" "Exclui um item do processamento. Esta opção pode ser usada várias vezes, " -"para excluir mais do que uma coisa. O \\fIitem\\fR é tipicamente parte de um " +"para excluir mais do que uma coisa. O I é tipicamente parte de um " "nome de ficheiro, e qualquer ficheiro que contenha o texto especificado será " "excluído." @@ -822,7 +846,6 @@ msgstr "NÍVEIS DE COMPATIBILIDADE" #. type: textblock #: debhelper.pod:315 -#, fuzzy #| msgid "" #| "From time to time, major non-backwards-compatible changes need to be made " #| "to debhelper, to keep it clean and well-designed as needs change and its " @@ -846,13 +869,10 @@ msgstr "" "experiência. Para prevenir que tais grandes alterações danifiquem os pacotes " "existentes, foi introduzido o conceito de níveis de compatibilidade no " "debhelper. Você deve dizer ao debhelper qual o nível de compatibilidade que " -"ele deve usar, e ele modifica o seu comportamento de várias maneiras. O " -"nível de compatibilidade é especificado no ficheiro F e este " -"ficheiro tem de estar presente." +"ele deve usar, e ele modifica o seu comportamento de várias maneiras." #. type: textblock #: debhelper.pod:322 -#, fuzzy #| msgid "" #| "Tell debhelper what compatibility level to use by writing a number to " #| "F. For example, to use v#RECOMMENDED_COMPAT# mode:" @@ -861,13 +881,14 @@ msgid "" "control> by adding a Build-Depends on the debhelper-compat package. For " "example, to use v#RECOMMENDED_COMPAT# mode, ensure F has:" msgstr "" -"Diz ao debhelper qual nível de compatibilidade deve usar ao escrever um " -"número em F. Por exemplo, para usar o modo " -"v#RECOMMENDED_COMPAT#:" +"No debhelper actual, você pode especificar o nível de compatibilidade em " +"F ao adicionar um Build-Depends no pacote debhelper-compat. " +"Por exemplo, para usar modo v#RECOMMENDED_COMPAT#, assegure que " +"F tem:" #. type: verbatim #: debhelper.pod:326 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| " Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#)\n" #| "\n" @@ -875,7 +896,7 @@ msgid "" " Build-Depends: debhelper-compat (= #RECOMMENDED_COMPAT#)\n" "\n" msgstr "" -" Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#)\n" +" Build-Depends: debhelper-compat (= #RECOMMENDED_COMPAT#)\n" "\n" #. type: textblock @@ -887,6 +908,12 @@ msgid "" "a specific point release of debhelper (such as for the introduction of a new " "feature or bugfix within a compatibility level)." msgstr "" +"Isto também serve como uma dependência de compilação de versão apropriada " +"numa versão suficiente do pacote debhelper, assim você não precisa de " +"especificar uma dependência de compilação de versão separada no pacote " +"debhelper a menos que precise de um lançamento pontual específico do " +"debhelper (tal como para a introdução de uma nova funcionalidade ou " +"correcção de bug dentro de um nível de compatibilidade)." #. type: textblock #: debhelper.pod:334 @@ -895,6 +922,9 @@ msgid "" "beta compatibility levels; packages experimenting with those compatibility " "levels should use F or B." msgstr "" +"Note que o debhelper não fornece debhelper-compat para os níveis de " +"compatibilidade experimental ou beta; os pacotes que experimentem com esses " +"níveis de compatibilidade devem usar F ou B." #. type: textblock #: debhelper.pod:338 @@ -910,10 +940,22 @@ msgid "" "uses. So, if you specify compatibility level #RECOMMENDED_COMPAT# in " "F, ensure F has:" msgstr "" +"As versões anteriores do debhelper requeriam o nível de compatibilidade " +"especificado no ficheiro F, e o debhelper actual ainda " +"suporta isto para compatibilidade com as versões anteriores, apesar de " +"um pacote não poder especificar um nível de compatibilidade via múltiplos " +"métodos de uma vez. Para usar este método, F deve conter " +"o nível de compatibilidade como um número singular, e nenhum outro conteúdo. " +"Se você especificar o nível de compatibilidade neste método, o seu pacote " +"vai também precisar duma dependência de compilação baseada em versão de " +"uma versão do pacote debhelper igual (ou superior) ao nível de " +"compatibilidade que o seu pacote usa. Assim, se você especificar o nível " +"de compatibilidade #RECOMMENDED_COMPAT# em F, assegure-se " +"que F tem:" #. type: verbatim #: debhelper.pod:349 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| " Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#)\n" #| "\n" @@ -921,7 +963,7 @@ msgid "" " Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#~)\n" "\n" msgstr "" -" Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#)\n" +" Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#~)\n" "\n" #. type: textblock @@ -1457,7 +1499,6 @@ msgstr "" #. type: textblock #: debhelper.pod:631 -#, fuzzy #| msgid "" #| "B no longer creates the package build directory when skipping running " #| "debhelper commands. This will not affect packages that only build with " @@ -1469,10 +1510,10 @@ msgid "" "packages that only build with debhelper commands, but it may expose bugs in " "commands not included in debhelper." msgstr "" -"B já não cria o directório de compilação do pacote quando salta a " -"execução de comandos debhelper. Isto não vai afectar pacotes que apenas " -"compilam com comandos debhelper, mas pode expor bugs em comandos não " -"incluídos no debhelper." +"B B já não cria o directório de compilação " +"do pacote quando salta a execução de comandos debhelper. Isto não vai afectar " +"pacotes que apenas compilam com comandos debhelper, mas pode expor bugs " +"em comandos não incluídos no debhelper." #. type: textblock #: debhelper.pod:636 @@ -1482,6 +1523,10 @@ msgid "" "there has been no reports of issues caused by this bug in those ~5 years, " "this item have been removed rather than fixed." msgstr "" +"Esta funcionalidade de compatibilidade tinha um bug desde a sua inserção " +"no debhelper/9.20130516 que o fazia falhar ao aplicar em compatibilidade 9 " +"e anteriores. Como não tem havido relatórios de problemas causados por este " +"bug nesses -5 anos, este item foi removido em vez de corrigido." #. type: =item #: debhelper.pod:643 @@ -1544,7 +1589,6 @@ msgstr "A grande maioria dos pacotes não serão afectados por esta alteração. #. type: textblock #: debhelper.pod:677 -#, fuzzy #| msgid "" #| "The B buildsystem now passes B to L. Derivative buildsystems (e.g. B " @@ -1554,8 +1598,8 @@ msgid "" "program=true\"> to L. Derivative buildsystems (e.g. B " "or B) are unaffected by this change." msgstr "" -"O sistema de compilação B agora passa B para o L. Sistemas de compilação derivativos (ex. " +"O sistema de compilação B agora passa B para o L. Sistemas de compilação derivativos (ex. " "B ou B) não são afectados por esta alteração." #. type: textblock @@ -1640,6 +1684,8 @@ msgid "" "Migration note: A bug in debhelper 11 up to 11.1.5 made B " "incorrectly ignore B<--sourcedir>." msgstr "" +"Nota de migração: Um bug no debhelper 11 até ao 11.1.5 faz com que " +"B ignore incorrectamente B<--sourcedir>." #. type: textblock #: debhelper.pod:726 @@ -1695,6 +1741,9 @@ msgid "" "I of the documentation in a different path to comply with the " "recommendation from Debian policy §12.3 (since version 3.9.7)." msgstr "" +"As ferramentas B e B podem agora instalar " +"I da documentação num caminho diferente para cumprir com a " +"recomendação da política Debian §12.3 (desde versão 3.9.7)." #. type: textblock #: debhelper.pod:754 @@ -1704,6 +1753,10 @@ msgid "" "change is not relevant for that source package and you can skip to the next " "change." msgstr "" +"Note que um dado pacote fonte apenas contém um único pacote binário " +"em F ou nenhum dos pacotes são pacotes I<-doc>, então esta " +"alteração não é relevante para esse pacote fonte e você pode saltar a " +"próxima alteração." #. type: textblock #: debhelper.pod:759 @@ -1715,10 +1768,15 @@ msgid "" "package> >> in the given doc package. I.e. the path can change but the " "documentation is still shipped in the I<-doc> package." msgstr "" +"Por predefinição, estas ferramentas irão agora tentar determinar um \"pacote " +"principal para a documentação\" (chamado um I daqui em " +"diante) para cada pacote I<-doc>. Se encontrarem o tal I, " +"irão agora instalar a documentação em F<< /usr/share/doc/I >> no pacote doc fornecido. Isto é, o caminho pode mudar mas a " +"documentação será na mesma enviada no pacote I<-doc>." #. type: textblock #: debhelper.pod:767 -#, fuzzy #| msgid "" #| "The B<--doc-main-package> option can be used when the auto-detection is " #| "insufficient." @@ -1728,7 +1786,8 @@ msgid "" "to diverge from Debian policy recommendation." msgstr "" "A opção B<--doc-main-package> pode ser usada quando a auto-detecção é " -"insuficiente." +"insuficiente ou para reiniciar o caminho para o seu valor anterior se existir " +"razão para divergir da recomendação da politica Debian." #. type: textblock #: debhelper.pod:771 @@ -1737,6 +1796,10 @@ msgid "" "include the copyright file, changelog files, README.Debian, etc. These " "files will still be installed in the path F<< /usr/share/doc/I >>." msgstr "" +"Alguma documentação não será afectada por esta alteração. Estas excepções " +"incluem o ficheiro copyright, ficheiros changelog, README.Debian, etc. Estes " +"ficheiros serão na mesma instalados no caminho " +"F<< /usr/share/doc/I >>." #. type: textblock #: debhelper.pod:778 @@ -1780,6 +1843,9 @@ msgid "" "dependency by default. This means that B<-VUpstream-Version> (a.k.a. B<-V>) " "is now the default." msgstr "" +"A ferramenta B agora gera ficheiros shlibs com dependência " +"de versão por predefinição. Isto significa que B<-VUpstream-Version> " +"(a.k.a. B<-V>) é agora a predefinição." #. type: textblock #: debhelper.pod:801 @@ -1788,6 +1854,9 @@ msgid "" "obtained by passing B<-VNone> instead. However, please see " "L for the caveat of unversioned dependencies." msgstr "" +"Se é pedida uma dependência sem versão no ficheiros shlibs, isto pode ser " +"conseguido ao passar B<-VNone> em substituição. No entanto, por favor " +"veja L para a problemática das dependências sem versão." #. type: textblock #: debhelper.pod:807 @@ -1870,6 +1939,7 @@ msgstr "" #: debhelper.pod:848 msgid "The B tool will now default to B<--list-missing>." msgstr "" +"A ferramenta B irá agora usar por predefinição B<--list-missing>." #. type: textblock #: debhelper.pod:852 @@ -1877,6 +1947,8 @@ msgid "" "The B tool will now only pass libraries to L if the ELF binary has a SONAME (containing \".so\")." msgstr "" +"A ferramenta B irá agora apenas passar bibliotecas para " +"L se o binário ELF tiver um SONAME (contendo \".so\")." #. type: textblock #: debhelper.pod:857 @@ -1884,6 +1956,8 @@ msgid "" "The B tool no longer compresses examples (i.e. anything " "installed in F</examples>>.)" msgstr "" +"A ferramenta B não mais comprime exemplos (isto é, nada " +"instalado em F</examples>>.)" #. type: textblock #: debhelper.pod:862 @@ -1894,6 +1968,11 @@ msgid "" "error. If you want to skip these commands, then please insert an empty " "override target for them in F (e.g. I)" msgstr "" +"A sequência standard em B agora inclui B e " +"B por predefinição. Isto tornas as sequências B " +"e B obsoletas e elas agora irão falhar com um erro. Se " +"desejar saltar estes comandos, por favor insira um alvo de sobreposição " +"vazio para eles em F (ex. I)" #. type: textblock #: debhelper.pod:871 @@ -1902,6 +1981,10 @@ msgid "" "libexecdir> variable and thus relies on the build system default - which " "should be B (per FHS 3.0, adopted in Debian Policy 4.1.5)." msgstr "" +"Os sistemas de compilação B e B não mais definem " +"explicitamente a variável B<--libexecdir> e assim apoia-se na predefinição " +"do sistema de compilação - O qual deve ser B (por FHS 3.0, " +"adoptado em Debian Policy 4.1.5)." #. type: textblock #: debhelper.pod:876 @@ -1910,10 +1993,13 @@ msgid "" "parameter can often be passed manually via L. E.g. " "via the following example:" msgstr "" +"Se um determinado pacote original do autor não usar a predefinição correcta, " +"o parâmetro pode muitas vezes ser passado manualmente via " +"L. Por exemplo via seguinte exemplo:" #. type: verbatim #: debhelper.pod:880 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "\toverride_dh_auto_configure:\n" #| "\t\tdh_auto_configure -- --with-foo --disable-bar\n" @@ -1923,14 +2009,14 @@ msgid "" " \tdh_auto_configure -- --libexecdir=/usr/libexec\n" "\n" msgstr "" -"\toverride_dh_auto_configure:\n" -"\t\tdh_auto_configure -- --with-foo --disable-bar\n" +" override_dh_auto_configure:\n" +" \tdh_auto_configure -- --libexecdir=/usr/libexec\n" "\n" #. type: textblock #: debhelper.pod:883 msgid "Note the B<--> before the B<--libexecdir> parameter." -msgstr "" +msgstr "Note o B<--> antes do parâmetro B<--libexecdir>." #. type: textblock #: debhelper.pod:887 @@ -1940,6 +2026,10 @@ msgid "" "level 3, where B began to automatically compute the resulting " "F control file." msgstr "" +"A ferramenta B não mais instala o ficheiro F " +"fornecido pelo mantenedor. O ficheiro torneou-se maioritariamente obsoleto " +"desde o nível de compatibilidade 3, onde B começo a computar " +"automaticamente o ficheiro de controle F resultante." #. type: textblock #: debhelper.pod:894 @@ -1949,6 +2039,10 @@ msgid "" "now be used in such a case to ensure the service is properly started under " "both sysvinit and systemd." msgstr "" +"A ferramenta B não mais se apoia em B " +"para lidar com os serviços do systemd que têm uma alternativa de sysvinit. " +"ambas ferramentas devem agora ser usadas em tais casos para assegurar que " +"o serviço é arrancado correctamente sob ambos sysvinit e systemd." #. type: textblock #: debhelper.pod:899 @@ -1956,6 +2050,9 @@ msgid "" "If you have an override for B (e.g. to call it with B<--no-" "start>) then you will probably need one for B as well now." msgstr "" +"Se tiver uma sobreposição para B (ex. para chamá-lo com " +"B<--no-start>) então irá provavelmente precisar agora também de um para " +"B." #. type: textblock #: debhelper.pod:903 @@ -1965,6 +2062,10 @@ msgid "" "${misc:Pre-Depends}> in its B field before upgrading to compat " "12." msgstr "" +"Esta alteração faz B injectar um I para " +"B<< init-system-helpers (>= 1.54~) >>. Por favor assegure que o pacote lista " +"B<${misc:Pre-Depends}> no seu campo B antes de actualizar " +"para a compatibilidade 12." #. type: textblock #: debhelper.pod:910 @@ -1975,6 +2076,12 @@ msgid "" "B to false to revert to the previous behaviour. See " "B for details and examples." msgstr "" +"Esta ferramenta de terceiros B (do pacote B) agora por " +"predefinição honra a variável B para instalação fonte em " +"pacotes -dev e não apenas durante o processo de compilação. Por favor defina " +"B para falso para reverter para o comportamento " +"anterior. Veja B para detalhes " +"e exemplos" #. type: textblock #: debhelper.pod:918 @@ -1982,6 +2089,8 @@ msgid "" "B is now included in the B standard sequence by " "default." msgstr "" +"B é agora incluído na sequência standard do B " +"por predefinição." #. type: textblock #: debhelper.pod:923 @@ -1989,13 +2098,14 @@ msgid "" "The B buildsystem is now removed. Please use the third-" "party build system B instead." msgstr "" +"O sistema de compilação B foi agora removido. Por favor " +"use o sistema de compilação de terceiros B em substituição." #. type: =item #: debhelper.pod:928 -#, fuzzy #| msgid "v1" msgid "v13" -msgstr "v1" +msgstr "v13" #. type: textblock #: debhelper.pod:930 strings-kept-translations.pod:9 @@ -2007,10 +2117,9 @@ msgstr "" #. type: textblock #: debhelper.pod:932 -#, fuzzy #| msgid "Changes from v10 are:" msgid "Changes from v12 are:" -msgstr "As alterações a partir de v10 são:" +msgstr "As alterações a partir de v12 são:" #. type: textblock #: debhelper.pod:938 @@ -2020,6 +2129,11 @@ msgid "" "passes extra parameters to upstream test runner should be reviewed as " "B is not command line compatible with B." msgstr "" +"O sistema de compilação B agora usa B em vez de " +"B quando corre a suite de testes. Qualquer sobreposição de " +"B que passe parâmetros extra ao testador original do autor " +"deve ser revista, pois o B não é compatível em linha de comandos " +"com o B." #. type: =head1 #: debhelper.pod:948 dh_auto_test:48 dh_dwz:57 dh_installcatalogs:64 @@ -2428,7 +2542,6 @@ msgstr "B" #. type: textblock #: debhelper.pod:1108 -#, fuzzy #| msgid "" #| "Temporarily specifies what compatibility level debhelper should run at, " #| "overriding any value in F." @@ -2438,7 +2551,8 @@ msgid "" "the F file." msgstr "" "Especifica temporariamente em que nível de compatibilidade o debhelper deve " -"correr, sobrepondo qualquer valor em F." +"correr, sobrepondo qualquer valor especificado via Build-Depend em " +"debhelper-compat ou via ficheiro F." #. type: =item #: debhelper.pod:1112 @@ -2519,10 +2633,9 @@ msgstr "" #. type: =item #: debhelper.pod:1140 -#, fuzzy #| msgid "B" msgid "B" -msgstr "B" +msgstr "B" #. type: textblock #: debhelper.pod:1142 @@ -2532,6 +2645,11 @@ msgid "" "addon to run with the --with flag in the debian/rules file. Any --without " "calls specifying an addon in this environment variable will not be run." msgstr "" +"Se definido, isto adiciona os addons especificados do dh para serem corridos " +"nos lugares apropriados na sequência de comandos. Isto é equivalente a " +"especificar o addon a correr coma bandeira --with no ficheiro " +"debian/rules file. Qualquer chamada --without que especifique um addon " +"nesta variável de ambiente não será executada." #. type: textblock #: debhelper.pod:1147 @@ -2541,6 +2659,11 @@ msgid "" "having to patch a large number of rules file. If at all possible, this " "should be avoided in favor of a --with flag in the rules file." msgstr "" +"Isto destina-se a ser usado por downstreams ou configurações locais " +"especificas que requeiram a execução dum addon do debhelper durante " +"múltiplas compilações sem terem que aplica patch a um grande número de " +"ficheiros de regras. Se de todo possível, isto deve ser evitado em favor de " +"uma bandeira --with no ficheiro rules." #. type: =head1 #: debhelper.pod:1154 debhelper-obsolete-compat.pod:118 dh:1104 @@ -2958,6 +3081,14 @@ msgid "" "insists on \"simple\" relations (e.g. a relation like \"BI | B\" will I imply B<--with> I)." msgstr "" +"Uma relação B no pacote BI implica um " +"I B<--with>. Isto evita a necessidade de um B<--with> explícito em " +"F que apenas duplica o que já está declarado via dependências " +"de compilação em F. Note que apenas as relações no campo " +"B são consideradas (isto é, B e B são deliberadamente não suportadas). por favor lembre-se que " +"B insiste em relações \"simples\" (ex. uma relação tipo \"BI | B\" I irá implicar o I B<--with>)." #. type: =item #: dh:71 @@ -3078,7 +3209,7 @@ msgstr "" #. type: verbatim #: dh:119 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "\toverride_dh_strip:\n" #| "\t\tdh_strip -Xfoo\n" @@ -3090,7 +3221,7 @@ msgid "" msgstr "" "\toverride_dh_strip:\n" "\t\tdh_strip -Xfoo\n" -"\t\n" +"\n" #. type: verbatim #: dh:122 @@ -4170,7 +4301,8 @@ msgstr "" #: dh_clean:21 #, no-wrap msgid "" -"B is a debhelper program that is responsible for cleaning up after a\n" +"B is a debhelper program that is responsible for cleaning up after" +" a\n" "package is built. It removes the package build directories, and removes some\n" "other files including F, and any detritus left behind by other\n" "debhelper commands. It also removes common files that should not appear in a\n" @@ -4410,16 +4542,16 @@ msgstr "Debian policy, versão 3.0" #: dh_dwz:5 msgid "dh_dwz - optimize DWARF debug information in ELF binaries via dwz" msgstr "" +"dh_dwz - optimiza informação de depuração DWARF em binários ELF via dwz" #. type: textblock #: dh_dwz:18 -#, fuzzy #| msgid "" #| "B [S>] [B<-n>] [S " #| "I>]" msgid "B [S>] [B<-X>I] [S I>]" msgstr "" -"B [S>] [B<-n>] [S I>]" +"B [S>] [B<-X>I] [S I>]" #. type: textblock #: dh_dwz:22 @@ -4428,11 +4560,14 @@ msgid "" "of the DWARF debug information in ELF binaries. It does so by running " "L on all the ELF binaries in the package." msgstr "" +"B é um programa de debhelper que irá optimizar o tamanho (não " +"comprimido) da informação de depuração DWARF nos binários ELF. Fá-lo ao " +"correr L em todos os binários ELF no pacote." #. type: =item #: dh_dwz:30 msgid "B<--dwz-multifile>, B<--no-dwz-multifile>" -msgstr "" +msgstr "B<--dwz-multifile>, B<--no-dwz-multifile>" #. type: textblock #: dh_dwz:32 @@ -4442,6 +4577,10 @@ msgid "" "least 2 ELF binaries, B will instruct L to generate a " "multifile for the package." msgstr "" +"Se L deve gerar um I a partir de binários ELF no mesmo " +"pacote (fá-lo por predefinição). Quando activado, se um pacote conter pelo " +"menos 2 binários ELF, B irá instruir L a gerar um multifile " +"para o pacote." #. type: textblock #: dh_dwz:37 @@ -4450,6 +4589,9 @@ msgid "" "can fit on a single command line. If this becomes a problem, please pass " "B<--no-dwz-multifile> to work around the issue." msgstr "" +"Note que estas opções podem não funcionar se um pacote conter mais binários " +"ELF que possam caber numa única linha de comandos. Se isto for um problema, " +"por favor passe B<--no-dwz-multifile> para contornar este problema." #. type: textblock #: dh_dwz:41 @@ -4457,6 +4599,7 @@ msgid "" "The generated multifile will be compressed with B." msgstr "" +"O multifile gerado será comprimido com B." #. type: textblock #: dh_dwz:46 dh_strip:44 @@ -4475,10 +4618,12 @@ msgid "" "Pass I to L when it processes ELF binaries. This is mostly " "useful for setting memory related parameters (e.g. -l and -L)." msgstr "" +"Passa I para L quando processa binários ELF. Isto é " +"maioritariamente útil para definir parâmetros relacionados com memória " +"(ex. -l e -L)." #. type: textblock #: dh_dwz:59 -#, fuzzy #| msgid "" #| "If the B environment variable contains B, " #| "nothing will be stripped, in accordance with Debian policy (section 10.1 " @@ -4490,9 +4635,7 @@ msgid "" "\"Binaries\")." msgstr "" "Se a variável de ambiente B conter B, nada será " -"despojado, em conformidade com a política Debian (secção 10.1 \"Binários\"). " -"Isto irá também inibir a criação automática de pacotes de símbolos de " -"depuração." +"despojado, em conformidade com a política Debian (secção 10.1 \"Binários\")." #. type: textblock #: dh_dwz:63 @@ -4503,6 +4646,11 @@ msgid "" "build times (e.g. for \"build and test\"-cycles) rather than optimizing for " "size." msgstr "" +"Embora esta ferramenta tecnicamente não remover informação de depuração " +"dos binários, é na mesma incluída quando a variável de ambiente " +"B contém B. Isto é assim porque B " +"é muito usado para optimizar tempos de compilação (ex. para -cycles de " +"\"compilar e testar\") em vez de optimizar para tamanho." #. type: textblock #: dh_fixperms:5 @@ -4579,11 +4727,12 @@ msgstr "" #. type: textblock #: dh_gconf:5 -#, fuzzy #| msgid "dh_gconf - install GConf defaults files and register schemas" msgid "" "dh_gconf - install GConf defaults files and register schemas (deprecated)" -msgstr "dh_gconf - instala ficheiros de predefinições GConf e regista schemas" +msgstr "" +"dh_gconf - instala ficheiros de predefinições GConf e regista schemas " +"(descontinuado)" #. type: textblock #: dh_gconf:17 @@ -4846,7 +4995,6 @@ msgstr "" #. type: textblock #: dh_install:36 -#, fuzzy #| msgid "" #| "From debhelper compatibility level 7 on, B will fall back to " #| "looking in F for files, if it doesn't find them in the " @@ -4909,6 +5057,8 @@ msgid "" "Used with the deprecated B<--list-missing> and B<--fail-missing> options. " "Please refer to L for the documentation of this file." msgstr "" +"Usado com as opções B<--list-missing> e B<--fail-missing> descontinuadas. " +"Por favor consulte L para a documentação deste ficheiro." #. type: =item #: dh_install:70 @@ -4923,6 +5073,10 @@ msgid "" "has processed all the files. Please see L for the " "documentation of this option." msgstr "" +"B: Por favor use B em vez deste. " +"Se usar esta opção, o B irá chamar B com essa opção " +"após ter processado todos os ficheiros. Por favor veja L para " +"a documentação sobre esta opção." #. type: =item #: dh_install:79 @@ -4937,6 +5091,11 @@ msgid "" "has processed all the files. Please see L for the " "documentation of this option." msgstr "" +"B: Por favor use B em vez deste. " +"Se usar esta opção, B irá chamar B com essa opção " +"após ter processado todos os ficheiros. Por favor veja L para" +" a " +"documentação sobre esta opção." #. type: =item #: dh_install:88 dh_installdirs:59 dh_installdocs:104 dh_installexamples:50 @@ -5208,7 +5367,6 @@ msgstr "" #. type: textblock #: dh_installchangelogs:24 -#, fuzzy #| msgid "" #| "An upstream F file may be specified as an option. If none is " #| "specified, it looks for files with names that seem likely to be " @@ -5220,9 +5378,10 @@ msgid "" "package is using compatibility level 7 or above)." msgstr "" "Pode ser especificado como uma opção um ficheiro F do autor " -"original (upstream) Se nenhum for especificado, procura ficheiros cujos " -"nomes apontam provavelmente para relatórios de alterações. (No nível 7 de " -"compatibilidade e níveis superiores.)" +"original (upstream) Se nenhum for especificado, B " +"pode procurar por ficheiros cujos nomes apontam provavelmente para relatórios " +"de alterações como descrito no próximo parágrafo (assumindo que o pacote " +"usa nível de compatibilidade 7 ou superior.)" #. type: textblock #: dh_installchangelogs:29 @@ -5236,6 +5395,15 @@ msgid "" "compatibility level 7 or any later) will look for changelog files in the " "source directory (e.g. the root or the F subdirectory)." msgstr "" +"Em pacotes não-nativos, o B irá primeiro procurar por " +"ficheiros changelog instalados pelo sistema de compilação do autor em " +"F<< usr/share/doc/I >> (do directório de compilação do pacote) e " +"renomear o melhor candidato (se existir algum) para F<< usr/share/doc/" +"I/changelog >>. Note que B I procura " +"nenhum directório fonte (tal como F). Caso contrário, " +"B (no nível de compatibilidade 7 ou posterior) irá " +"procurar por ficheiros changelog no directório fonte (ex. a raiz do " +"sub-directório F)." #. type: textblock #: dh_installchangelogs:39 @@ -5248,7 +5416,6 @@ msgstr "" #. type: textblock #: dh_installchangelogs:42 -#, fuzzy #| msgid "" #| "If the upstream changelog is an F file (determined by file " #| "extension), it will be installed as F is generated, " "pointing readers at the html changelog file." msgstr "" -"Se o relatório de alterações do autor for um ficheiro F (determinado " -"pela extensão do ficheiro), em vez disso será instalado como F. Se o relatório html for convertido para texto " -"simples, essa variante pode ser especificada como o segundo ficheiro de " -"relatório de alterações do autor. Quando nenhuma variante de texto simples é " -"especificada, é gerado um curto F, " -"apontando os leitores para o ficheiro de relatório html." +"Se o relatório de alterações especificado do autor for um ficheiro F " +"(determinado pela extensão do ficheiro), em vez disso será instalado como " +"F. Se o relatório html for convertido " +"para texto simples, essa variante pode ser especificada como o segundo " +"ficheiro de relatório de alterações do autor. Quando nenhuma variante de " +"texto simples é especificada, é gerado um curto F, apontando os leitores para o ficheiro de relatório html." #. type: =item #: dh_installchangelogs:53 @@ -5350,6 +5517,7 @@ msgstr "" #: dh_installchangelogs:90 msgid "Note that directory name of the changelog is also part of the match." msgstr "" +"Note que o nome de directório do changelog é também parte correspondente." #. type: =item #: dh_installchangelogs:92 @@ -5524,6 +5692,10 @@ msgid "" "conffiles. However, it has become de facto obsolete since debhelper " "automatically computed which files should be marked as conffiles." msgstr "" +"Historicamente, este ficheiro era preciso para marcar manualmente ficheiros " +"como ficheiros de configuração (conffiles). No entanto, tem-se tornado de " +"facto obsoleto desde que o debhelper passou a computar automaticamente " +"quais os ficheiros devem ser marcados como ficheiros de configuração." #. type: textblock #: dh_installdeb:57 @@ -5532,6 +5704,9 @@ msgid "" "installed into the F directory. In compatibility level 12 and " "later, the file is silently ignored." msgstr "" +"Em nível de compatibilidade até e incluindo 11, este ficheiro de controle " +"será instalado no directório F. Em nível de compatibilidade 12 e " +"posterior, o ficheiro é ignorado em silêncio." #. type: =item #: dh_installdeb:61 @@ -5747,7 +5922,6 @@ msgstr "" #. type: textblock #: dh_installdirs:17 -#, fuzzy #| msgid "" #| "B [S>] [B<--sourcedir=>I] [B<-" #| "X>I] [S ...>]" @@ -5755,8 +5929,8 @@ msgid "" "B [S>] [B<-A>] [B<--sourcedir=>I] " "[B<--create-in-sourcedir>] [S ...>]" msgstr "" -"B [S>] [B<--sourcedir=>I] [B<-" -"X>I] [S ...>]" +"B [S>] [B<-A>] [B<--sourcedir=>I] " +"[B<--create-in-sourcedir>] [S ...>]" #. type: textblock #: dh_installdirs:21 @@ -5810,7 +5984,7 @@ msgstr "" #. type: =item #: dh_installdirs:51 msgid "B<--create-in-sourcedir>, B<--no-create-in-sourcedir>" -msgstr "" +msgstr "B<--create-in-sourcedir>, B<--no-create-in-sourcedir>" #. type: textblock #: dh_installdirs:53 @@ -5819,13 +5993,15 @@ msgid "" "F) I in the package build directory (usually F<< " "debian/I >>)." msgstr "" +"Ou para criar os directórios especificados no directório fonte (geralmente " +"F) I no directório de compilação do pacote " +"(geralmente F<< debian/I >>)." #. type: textblock #: dh_installdirs:57 -#, fuzzy #| msgid "The default is to create debug symbol packages." msgid "The default is B<--no-create-in-sourcedir>." -msgstr "A predefinição é criar pacotes de símbolos de depuração." +msgstr "A predefinição é B<--no-create-in-sourcedir>." #. type: textblock #: dh_installdirs:61 @@ -5833,6 +6009,8 @@ msgid "" "Consider I the source directory for the packages acted on instead of " "the default (which is usually F)." msgstr "" +"Considera I o directório fonte para os pacotes em actuação em vez da " +"predefinição (que geralmente é F)." #. type: textblock #: dh_installdirs:64 @@ -5841,6 +6019,9 @@ msgid "" "option (when B<--no-create-in-sourcedir> is in effect, this option does " "nothing in B)." msgstr "" +"Por favor note que esta opção é dependente da opção B<--create-in-sourcedir> " +"(quando B<--no-create-in-sourcedir> está em efeito, esta opção não faz nada " +"em B)." #. type: =item #: dh_installdirs:68 @@ -5899,7 +6080,6 @@ msgstr "" #. type: textblock #: dh_installdocs:31 dh_installexamples:27 dh_installinfo:24 dh_installman:69 -#, fuzzy #| msgid "" #| "From debhelper compatibility level 7 on, B will fall back to " #| "looking in F for files, if it doesn't find them in the " @@ -5910,13 +6090,12 @@ msgid "" "looking in F for files, if it does not find them in the current " "directory (or wherever you've told it to look using B<--sourcedir>)." msgstr "" -"Desde nível de compatibilidade 7 do debhelper em diante, o B irá " +"Desde nível de compatibilidade 11 do debhelper em diante, o B irá " "procurar os ficheiros em F, se não os encontrar no directório " "actual (ou onde você o mandou procurar usando B<--sourcedir>)." #. type: textblock #: dh_installdocs:35 -#, fuzzy #| msgid "" #| "In compat 11 and later, B offers many of the features " #| "that L also have. Furthermore, B also " @@ -6225,7 +6404,6 @@ msgstr "" #. type: textblock #: dh_installdocs:168 -#, fuzzy #| msgid "" #| "B: The use of B<--link-doc> should only be done when the " #| "packages have same \"architecture\" type. A link from a architecture " @@ -6240,9 +6418,9 @@ msgid "" msgstr "" "B: O uso de B<--link-doc> apenas deve ser feito quando os pacotes " "têm o mesmo tipo de \"arquitectura\". Um link de um pacote independente de " -"arquitectura para um pacote depende de arquitectura (ou vice-versa) não irá " -"funcionar. Desde compatibilidade 10, o debhelper irá rejeitar activamente " -"combinações não suportadas." +"uma arquitectura para um pacote depende de uma arquitectura (ou vice-versa) " +"não irá funcionar. Desde compatibilidade 10, o debhelper irá rejeitar " +"activamente combinações não suportadas." #. type: textblock #: dh_installdocs:176 @@ -6656,7 +6834,6 @@ msgstr "" #. type: textblock #: dh_installinit:22 -#, fuzzy #| msgid "" #| "B is a debhelper program that is responsible for " #| "installing init scripts with associated defaults files. In compatibility " @@ -6673,8 +6850,12 @@ msgid "" msgstr "" "B é um programa debhelper que é responsável por instalar " "scripts init com os ficheiros de predefinições associados. Em níveis de " -"compatibilidade até ao 11, o B também lida com ficheiros de " -"trabalhos upstart, e ficheiros de serviço do systemd." +"compatibilidade até, e incluindo, 10, B ira também instalar " +"alguns ficheiros relacionados com o systemd fornecidos pelo empacotamento " +"debian (veja a secção L em baixo). Em níveis de compatibilidade " +"até, e incluindo, 11, B irá também lidar com trabalhos de " +"arranque fornecidos pelo empacotamento debian (veja L para " +"mais informação sobre isto também)." #. type: textblock #: dh_installinit:31 @@ -6960,10 +7141,13 @@ msgid "" "as it is the first (functional) version that supports B<< update-rc.d " "EscriptE defaults-disabled >>." msgstr "" +"Desactiva o script de init na purga, mas não o activa na instalação. Isto " +"implica uma dependência baseada na versão em B<< init-system-helpers " +"(E= 1.51) >> pois é a primeira versão funcional que suporta " +"B<< update-rc.d EscriptE defaults-disabled >>." #. type: textblock #: dh_installinit:149 -#, fuzzy #| msgid "" #| "B that this option does not affect whether the services are " #| "started. That is controlled by L (using e.g. its " @@ -6973,18 +7157,18 @@ msgid "" "Please remember to also use B<--no-start> if the service should not be " "started." msgstr "" -"B que esta opção não afecta se os serviços são arrancados. Isso é " -"controlado por L (usando por exemplo a sua opção B<--no-" -"start>)." +"B que esta opção não afecta se os serviços são arrancados. Por favor " +"lembre-se de também usar B<--no-start> se o serviço não deverá ser arrancado." #. type: textblock #: dh_installinit:153 -#, fuzzy #| msgid "B<-u>I B<--update-rcd-params=>I" msgid "" "Cannot be combined with B<-u>I, B<--update-rcd-params=>I, or " "B<--> I." -msgstr "B<-u>I B<--update-rcd-params=>I" +msgstr "" +"Não pode ser combinado com B<-u>I, B<--update-rcd-params=>I, " +"ou B<--> I." #. type: =item #: dh_installinit:156 @@ -7016,7 +7200,6 @@ msgstr "B<-u>I B<--update-rcd-params=>I" #. type: textblock #: dh_installinit:169 -#, fuzzy #| msgid "" #| "Pass I to L. If not specified, B will " #| "be passed to L." @@ -7025,13 +7208,14 @@ msgid "" "B with B<--no-enable>) will be passed to L." msgstr "" -"Passa I para L. Se não for especificado, as " -"B serão passadas para L." +"Passa I para L. Se não especificado, B" +" (ou " +"B com B<--no-enable>) será passado para L." #. type: textblock #: dh_installinit:173 msgid "Cannot be combined with B<--no-enable>." -msgstr "" +msgstr "Não pode ser combinado com B<--no-enable>." #. type: textblock #: dh_installinit:177 @@ -7100,10 +7284,9 @@ msgstr "" #. type: textblock #: dh_installinit:427 -#, fuzzy #| msgid "L, L" msgid "L, L" -msgstr "L, L" +msgstr "L, L" #. type: textblock #: dh_installinit:435 @@ -7117,24 +7300,21 @@ msgstr "Michael Stapelberg " #. type: textblock #: dh_installinitramfs:5 -#, fuzzy #| msgid "" #| "dh_installinit - install service init files into package build directories" msgid "dh_installinitramfs - install initramfs hooks and setup maintscripts" msgstr "" -"dh_installinit - instala ficheiros de iniciação de serviços em directórios " -"de compilação de pacotes" +"dh_installinitramfs - instala hooks de initramfs e scripts principais de " +"configuração" #. type: textblock #: dh_installinitramfs:17 -#, fuzzy #| msgid "B [S>] [B<-n>]" msgid "B [S>] [B<-n>]" -msgstr "B [S>] [B<-n>]" +msgstr "B [S>] [B<-n>]" #. type: textblock #: dh_installinitramfs:21 -#, fuzzy #| msgid "" #| "B is a debhelper program that is responsible for " #| "installing mime files into package build directories." @@ -7142,12 +7322,11 @@ msgid "" "B is a debhelper program that is responsible for " "installing Debian package provided initramfs hooks." msgstr "" -"B é um programa debhelper que é responsável por instalar " -"ficheiros mime em directórios de compilação de pacotes." +"B é um programa debhelper que é responsável por instalar " +"um pacote Debian que fornece hooks de initramfs" #. type: textblock #: dh_installinitramfs:24 -#, fuzzy #| msgid "" #| "It also automatically generates the F and F commands " #| "needed to interface with the Debian B package. These commands are " @@ -7159,16 +7338,17 @@ msgid "" "initramfs system. These commands are inserted into the maintainer scripts " "by L." msgstr "" -"Também gera automaticamente os comandos F e F necessários " -"para interagir com o pacote Debian B. Estes comandos são inseridos nos " -"scripts do mantenedor pelo L." +"Se o B instalar ou (em compatibilidade 12 ou posterior) " +"detectar um ou mais hooks de initramfs no pacote, então também gera " +"automaticamente os comandos F e F necessários " +"para interagir com o sistema initramfs de Debian B. Estes comandos " +"são inseridos nos scripts do mantenedor pelo L." #. type: =item #: dh_installinitramfs:34 -#, fuzzy #| msgid "debian/I.init" msgid "debian/I.initramfs-hook" -msgstr "debian/I.init" +msgstr "debian/I.initramfs-hook" #. type: textblock #: dh_installinitramfs:36 @@ -7178,6 +7358,10 @@ msgid "" "B in L for more information about " "initramfs hooks." msgstr "" +"Assumido ser um hook de initramfs que será instalado em F<< usr/share/" +"initramfs-tools/hooks/I >> no directório de compilação do pacote. " +"Veja B em L para mais informação acerca " +"de hooks de initramfs." #. type: textblock #: dh_installinitramfs:49 dh_installmenu:50 @@ -7186,10 +7370,9 @@ msgstr "Não modifique os scripts F/F." #. type: textblock #: dh_installinitramfs:87 -#, fuzzy #| msgid "L L L" msgid "L L L" -msgstr "L L L" +msgstr "L L L" #. type: textblock #: dh_installlogcheck:5 @@ -8029,7 +8212,6 @@ msgstr "" #. type: textblock #: dh_installwm:54 -#, fuzzy #| msgid "" #| "Create any links specified by command line parameters in ALL packages " #| "acted on, not just the first." @@ -8037,8 +8219,8 @@ msgid "" "Modify scripts for window managers specified by command line parameters in " "ALL packages acted on, not just the first." msgstr "" -"Cria quaisquer links especificados por parâmetros de linha de comandos em " -"TODOS os pacotes em que actua, e não apenas no primeiro." +"Modifica scripts para gestores de janelas especificados por parâmetros de " +"linha de comandos em TODOS os pacotes em que actua, e não apenas no primeiro." #. type: =item #: dh_installwm:57 @@ -8228,7 +8410,6 @@ msgstr "" #. type: textblock #: dh_link:56 -#, fuzzy #| msgid "" #| "In each pair the source file (called B by L) comes first " #| "and is followed by the destination file (called B by " @@ -8432,14 +8613,11 @@ msgstr "" #. type: textblock #: dh_listpackages:26 -#, fuzzy #| msgid "" #| "These files are installed into the first binary package listed in debian/" #| "control." msgid "Packages are listed in the order they appear in F." -msgstr "" -"Estes ficheiros são instalados no primeiro pacote binário listado em debian/" -"control." +msgstr "Pacotes são listados na ordem que aparecem em F." #. type: textblock #: dh_makeshlibs:5 @@ -8563,6 +8741,8 @@ msgid "" "If a shlibs file is generated by this program, this option controls what " "version will be used in the dependency relation." msgstr "" +"Se um ficheiro shlibs for gerado por este programa, esta opção controla " +"que versão será usada na relação de dependência." #. type: textblock #: dh_makeshlibs:70 @@ -8570,16 +8750,20 @@ msgid "" "In compat 12 and later, B defaults to B<-VUpstream-Version>. " "In compat 11 and earlier the default behaved like B<-VNone>.." msgstr "" +"Em compatibilidade 12 e posterior, B usa por predefinição " +"B<-VUpstream-Version>. Em compatibilidade 11 e anterior o comportamento " +"predefinido é como B<-VNone>.." #. type: textblock #: dh_makeshlibs:73 msgid "The B tool can generate dependencies in three variants:" msgstr "" +"A ferramenta B pode gerar dependências em três variantes:" #. type: =item #: dh_makeshlibs:77 msgid "B<-VUpstream-Version>" -msgstr "" +msgstr "B<-VUpstream-Version>" #. type: textblock #: dh_makeshlibs:79 @@ -8588,10 +8772,12 @@ msgid "" "Note that I is case-sensitive and must be written exactly " "as shown here." msgstr "" +"A dependência será \"I B<(E>= IB<)>\". " +"Note que I é sensível a maiúsculas/minúsculas e tem de " +"ser escrito exactamente como mostrado aqui." #. type: textblock #: dh_makeshlibs:83 -#, fuzzy #| msgid "" #| "Beware of using B<-V> without any parameters; this is a conservative " #| "setting that always ensures that other packages' shared library " @@ -8606,14 +8792,10 @@ msgid "" "the library is prone to changing ABI without updating the upstream version " "number)." msgstr "" -"Cuidado ao usar B<-V> sem nenhuns parâmetros; isto é uma definição " -"conservativa que assegura sempre que as dependências de bibliotecas " -"partilhadas dos pacotes mais antigos são pelo menos tão justas o quanto " -"precisam de ser (a menos que a sua biblioteca seja inclinada a alterar a ABI " -"sem actualizar o número de versão do autor), para que se o mantenedor fizer " -"asneira então elas não irão quebrar. O outro lado é que os pacotes podem " -"acabar com dependências demasiado apertadas e devido a isso ser muito " -"difíceis de serem actualizados." +"Esta é uma definição conservativa que assegura sempre que as dependências " +"de bibliotecas partilhadas dos pacotes mais antigos são pelo menos tão justas " +"o quanto precisam de ser (a menos que a biblioteca seja inclinada a alterar a " +"ABI sem actualizar o número de versão do autor)." #. type: textblock #: dh_makeshlibs:88 @@ -8623,6 +8805,11 @@ msgid "" "often of minor temporary inconvenience and usually a lot better than the " "fall out caused by forgetting to bump the dependency information." msgstr "" +"O reverso da medalha é que os pacotes podem acabar com dependências muito " +"apertadas em alguns casos (note que um ficheiro symbols pode mitigar esta " +"situação). Isto é geralmente uma inconveniência menor temporária e " +"normalmente muito melhor que a falha causada ao esquecer de inserir a " +"informação de dependência." #. type: textblock #: dh_makeshlibs:94 @@ -8631,13 +8818,15 @@ msgid "" "V> without any dependency information was used instead (and that form still " "works)" msgstr "" +"Este formato explícito foi adicionado no debhelper/11.3. Nas versões " +"anteriores, era usado em vez disto um B<-V> sem nenhuma informação de " +"dependência (e esse formato ainda funciona)." #. type: =item #: dh_makeshlibs:98 -#, fuzzy #| msgid "B<-V>" msgid "B<-VNone>" -msgstr "B<-V>" +msgstr "B<-VNone>" #. type: textblock #: dh_makeshlibs:100 @@ -8645,6 +8834,8 @@ msgid "" "The dependency will be \"I\". Note that I is case-" "sensitive and must be written exactly as shown here." msgstr "" +"A dependência será \"I\". Note que I é sensível a " +"maiúsculas/minúsculas e tem de ser escrito exactamente como mostrado aqui." #. type: textblock #: dh_makeshlibs:103 @@ -8654,6 +8845,11 @@ msgid "" "interfaces over time and packagers are recommended to use B<-VUpstream-" "Version> (or one of the other forms of B<-V>I)." msgstr "" +"Este formato é na generalidade não seguro sendo a única excepção se o autor " +"original não estender a ABI de maneira nenhuma. No entanto, a maioria dos " +"autores originais melhoram as suas interfaces com o passar do tempo e é " +"recomendado que os pacotes usem B<-VUpstream-Version> (ou um dos outros " +"formatos de B<-V>I)." #. type: textblock #: dh_makeshlibs:108 @@ -8663,13 +8859,16 @@ msgid "" "packages. Note that symbols are not supported for udeb packages, which " "solely relies on shlibs for dependency handling." msgstr "" +"Alternativamente, isto pode ser suficiente se (e apenas se) o pacote usar " +"versão por símbolo (veja L) e I compilar nenhum " +"pacote udeb. Note que symbols não são suportados para pacotes udeb, os quais " +"apenas se apoiam em shlibs para manuseamento das dependências." #. type: =item #: dh_makeshlibs:113 -#, fuzzy #| msgid "B<--ddeb-migration=>I" msgid "B<-V>I" -msgstr "B<--ddeb-migration=>I" +msgstr "B<-V>I" #. type: textblock #: dh_makeshlibs:115 @@ -8679,6 +8878,10 @@ msgid "" "package-name> B<(E>= IB<)>\". Remember to include " "the package name." msgstr "" +"Neste caso, o valor passado a B<-V> irá ser usado como uma relação de " +"dependência. O I deve geralmente ser do formato \"I B<(E>= IB<)>\". Lembre-se de incluir " +"o nome do pacote." #. type: textblock #: dh_makeshlibs:120 @@ -8687,6 +8890,9 @@ msgid "" "or modification. In I cases, this is needed to generate a " "dependency on a different package than the one containing the library." msgstr "" +"Note que o debhelper irá usar o calor I sem verificações de " +"sanidade ou modificação. Em casos I, isto é preciso para " +"gerar uma dependência num pacote diferente daquele que contém a biblioteca." #. type: textblock #: dh_makeshlibs:127 @@ -8696,6 +8902,10 @@ msgid "" "file for regular .deb packages. See L for more " "information on this topic." msgstr "" +"Quando escolher um valor para esta opção, por favor lembre-se que se o " +"pacote fornecer um ficheiro symbols, então esse é geralmente preferido " +"sobre o ficheiro shlibs para pacotes .deb regulares. Veja " +"L para mais informação sobre este tópico." #. type: textblock #: dh_makeshlibs:134 @@ -8742,10 +8952,9 @@ msgstr "Passa I para L." #. type: =item #: dh_makeshlibs:159 -#, fuzzy #| msgid "B" msgid "B" -msgstr "B" +msgstr "B" #. type: verbatim #: dh_makeshlibs:161 @@ -8763,10 +8972,9 @@ msgstr "" #. type: =item #: dh_makeshlibs:165 -#, fuzzy #| msgid "B" msgid "B" -msgstr "B" +msgstr "B" #. type: verbatim #: dh_makeshlibs:167 @@ -9535,10 +9743,12 @@ msgstr "" #: dh_strip:100 #, no-wrap msgid "" -" dh_strip --dbgsym-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<< 2.1-3~)'\n" +" dh_strip --dbgsym-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<<" +" 2.1-3~)'\n" "\n" msgstr "" -" dh_strip --dbgsym-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<< 2.1-3~)'\n" +" dh_strip --dbgsym-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<<" +" 2.1-3~)'\n" "\n" #. type: =item @@ -9663,6 +9873,8 @@ msgid "" "B is used to determine if the target is being run with " "sufficient access to (fake)root." msgstr "" +"B é usado para determinar se um alvo está a ser corrido com " +"acesso suficiente a (fake)root." #. type: textblock #: dh_testroot:18 @@ -9674,6 +9886,12 @@ msgid "" "the builder followed the minimum requirements for the given value of " "I." msgstr "" +"A definição de acesso suficiente depende em se o construtor (a ferramenta " +"que invoca o alvo F) suporta o campo I " +"(R³). Se o construtor suportar R³, então irá regular a variável de ambiente " +"I e B irá validar que o construtor " +"seguiu os requerimentos mínimos para a valor fornecido de " +"I." #. type: textblock #: dh_testroot:25 @@ -9683,6 +9901,10 @@ msgid "" "B (and the rest of debhelper) fall back to assuming that " "(fake)root is implied." msgstr "" +"Se o construtor não suportar I, então não irá regular " +"a variável de ambiente I. Isto irá fazer com que " +"B (e o resto do debhelper) recorra a assumir que é implicado " +"(fake)root." #. type: textblock #: dh_testroot:30 @@ -9691,16 +9913,20 @@ msgid "" "I environment variable (leading and trailing " "whitespace in the variable is ignored)." msgstr "" +"O seguinte é um sumário de como B se comporta baseado na " +"variável de ambiente I (os espaços em branco no " +"inicio e no final na variável são ignorados)." #. type: textblock #: dh_testroot:38 -#, fuzzy #| msgid "" #| "B asserts that it is run as root or under L." msgid "" "If unset, or set to C, then B asserts that it " "is run as root or under L." -msgstr "B deduz que é corrido como root ou sob L." +msgstr "" +"Se não definido, ou definido para C, então B " +"deduz que é corrido como root ou sob L." #. type: textblock #: dh_testroot:43 @@ -9708,10 +9934,11 @@ msgid "" "If set to C, then B returns successfully (without " "performing any additional checks)." msgstr "" +"Se definido para C, então B retorna com sucesso (sem " +"executar nenhuma verificação adicional)." #. type: textblock #: dh_testroot:48 -#, fuzzy #| msgid "" #| "B asserts that it is either run as root (or under " #| "L) or the builder has provided the B " @@ -9722,9 +9949,10 @@ msgid "" "provided the B environment variable (e.g. via dpkg-" "buildpackage -r)." msgstr "" -"B declara que ou é corrido como root (ou sob L) ou " -"o compilador disponibilizou a variável de ambiente B " -"(ex. via dpkg-buildpackage -r)." +"Se definido para qualquer outro valor que o de cima, então B " +"declara que ou é corrido como root (ou sob L) ou o construtor " +"disponibilizou a variável de ambiente B (ex. via " +"dpkg-buildpackage -r)." #. type: textblock #: dh_testroot:55 @@ -9735,6 +9963,11 @@ msgid "" "enables things like testing for what will happen when " "I is set to a given value." msgstr "" +"Por favor note que B I lê o campo I. " +"O que implica que B pode produzir resultados incorrectos se o " +"construtor apoiar-se em I. Por outro lado, também " +"activa coisas como testar o que irá acontecer quando " +"I está definida para um determinado valor." #. type: textblock #: dh_usrlocal:7 @@ -9782,6 +10015,9 @@ msgid "" "(effectively) I, the directories in F will be " "handled as if they were owned by root:root (see below)." msgstr "" +"Quando a variável de ambiente I não é " +"(efectivamente) I, os directórios em F serão " +"lidados como se fossem da posse de root:root (veja em baixo)." #. type: textblock #: dh_usrlocal:40 @@ -9790,6 +10026,9 @@ msgid "" "value of I, the owners, groups and permissions will be " "preserved with the sole exception where the directory is owned by root:root." msgstr "" +"Quando a variável de ambiente I tem um valor " +"efectivo de I, então donos, grupos e permissões serão " +"preservados com a única excepção onde o directório é da posse de root:root." #. type: textblock #: dh_usrlocal:44 @@ -9800,6 +10039,11 @@ msgid "" "the system has F (as documented in the " "Debian Policy Manual §9.1.2 since version 4.1.4)" msgstr "" +"Se um directório é da posse de root:root, então o dono é determinado na " +"altura da instalação. Os bits de posse e permissões irão ser ou root:root " +"modo 0755 ou root:staff modo 02775. A escolha depende em se o sistema " +"tem F (como documentado no Manual de " +"Politica Debian §9.1.2 desde a versão 4.1.4)" #. type: textblock #: dh_usrlocal:68 -- cgit v1.2.3 From 32dce36087c35668b74815e0f88eefce250d31a9 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 17 May 2019 20:19:27 +0000 Subject: dh_perl: Fix code for pruning usr/share/doc Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ dh_perl | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a27f20bc..712000f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ debhelper (12.1.2) UNRELEASED; urgency=medium value of the last error (if any). * Buildsystem/make: Fix regression where cross-flags were passed in a non-cross build. (Closes: #925175) + * dh_perl: Fix code to prune (skip) /usr/share/doc which + never worked. [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/dh_perl b/dh_perl index 36637829..d79b7957 100755 --- a/dh_perl +++ b/dh_perl @@ -109,19 +109,26 @@ foreach my $package (@{$dh{DOPACKAGES}}) { }, @dirs if @dirs; # find scripts - find sub { - return unless -f and (-x _ or /\.pl$/); - if ($File::Find::dir =~ m{/usr/share/doc/}) { - $File::Find::prune = 1 if -d _; + $tmp =~ tr:/:/:s; + $tmp =~ s{[^/]\K/$}{}; + my $usd_dir = "$tmp/usr/share/doc"; + my $check_script = sub { + if ($_ eq $usd_dir) { + $File::Find::prune = 1 if -d $_; return; } + return unless -f and (-x _ or /\.pl$/); return unless open(my $fd, '<', $_); if (read($fd, local $_, 32) and m%^#!\s*(/usr/bin/perl|/usr/bin/env\s+perl)\s%) { $deps |= PROGRAM; } close($fd); - }, $tmp; + }; + find({ + wanted => $check_script, + no_chdir => 1, + }, $tmp); if ($deps) { my $version=""; -- cgit v1.2.3 From c262372b3684fe116f7a1d2f79c0a166d6ea68b3 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 18 May 2019 10:41:22 +0000 Subject: PROGRAMMING: Document DH_AUTOSCRIPTDIR Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ doc/PROGRAMMING | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 712000f6..d5437c73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ debhelper (12.1.2) UNRELEASED; urgency=medium passed in a non-cross build. (Closes: #925175) * dh_perl: Fix code to prune (skip) /usr/share/doc which never worked. + * doc/PROGRAMMING: Document that the environment variable + DH_AUTOSCRIPTDIR can be used for testing purposes to + shadow existing or test new autoscript snippets. Thanks + to Dmitry Bogatov for the suggestion. (Closes: #925281) [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING index af4fedeb..893b87fc 100644 --- a/doc/PROGRAMMING +++ b/doc/PROGRAMMING @@ -248,7 +248,11 @@ autoscript($package, $scriptname, $snippetname, $substparam) Pass parameters: - binary package to be affected - script to add to - - filename of snippet + - filename of snippet. For testing purposes, you can set the + environment variable DH_AUTOSCRIPTDIR to a directory contaning + the snippets, which can be used to shadow the snippets provided + in /usr/share/debhelper/autoscripts (or to test newly added + snippets). - (optional) A substitution parameter, which is one of 3 times: * sed commands to run on the snippet. E.g. s/#PACKAGE#/$PACKAGE/ Note: Passed to the shell inside double quotes. -- cgit v1.2.3 From 809f5afc73b068944f2bdda349b16dedfe1882e7 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 19 May 2019 10:03:20 +0000 Subject: dh_compress: Exclude .haddock and .hs by default Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ dh_compress | 1 + 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d5437c73..ed2da600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ debhelper (12.1.2) UNRELEASED; urgency=medium DH_AUTOSCRIPTDIR can be used for testing purposes to shadow existing or test new autoscript snippets. Thanks to Dmitry Bogatov for the suggestion. (Closes: #925281) + * dh_compress: Exclude .haddock and .hs files (as this is + customary for haskell packages). [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/dh_compress b/dh_compress index d801d833..d90c0f2c 100755 --- a/dh_compress +++ b/dh_compress @@ -136,6 +136,7 @@ on_pkgs_in_parallel { ! -iname "*.odg" ! -iname "*.odp" ! -iname "*.odt" \\ ! -iname ".htaccess" ! -iname "*.css" \\ ! -iname "*.xz" ! -iname "*.lz" ! -iname "*.lzma" \\ + ! -iname "*.haddock" ! -iname "*.hs" \\ ! -iname "*.svg" ! -iname "*.svgz" ! -iname "*.js" \\ ! -name "index.sgml" ! -name "objects.inv" ! -name "*.map" \\ ! -name "*.devhelp2" ! -name "search_index.json" \\ -- cgit v1.2.3 From 4de9f81f589aa6aa17a68cea45af15ad2b245c98 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 18 Jun 2019 17:46:47 +0000 Subject: dh_installinfo: Update NOOP PROMISE to fix issue dh_missing Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_installinfo | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ed2da600..f7ca0916 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ debhelper (12.1.2) UNRELEASED; urgency=medium to Dmitry Bogatov for the suggestion. (Closes: #925281) * dh_compress: Exclude .haddock and .hs files (as this is customary for haskell packages). + * dh_installinfo: Update NOOP PROMISE to account for + dh_missing's needs. Thanks to Daniel Kahn Gillmor for + reporting the issue. (Closes: #930689) [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/dh_installinfo b/dh_installinfo index 6153743c..f322d90a 100755 --- a/dh_installinfo +++ b/dh_installinfo @@ -67,7 +67,7 @@ init(options => { "sourcedir=s" => \$dh{SOURCEDIR}, }); -# PROMISE: DH NOOP WITHOUT info cli-options() +# PROMISE: DH NOOP WITHOUT pkgfile-logged(info) cli-options() my $default_error_handler = compat(10) ? \&glob_expand_error_handler_reject_nomagic_warn_discard : \&glob_expand_error_handler_reject; my $nodocs = is_build_profile_active('nodoc') || get_buildoption('nodoc') ? 1 : 0; -- cgit v1.2.3 From 3eee6801905dc62dad6c139cf24f0c0cbcff274e Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 13 Jul 2019 13:45:46 +0000 Subject: debhelper.pod: Document usage of dpkg-buildflags vs. *FLAGS env variables Signed-off-by: Niels Thykier --- debhelper.pod | 9 +++++++++ debian/changelog | 4 ++++ 2 files changed, 13 insertions(+) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index acee4e20..425514e6 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -1149,6 +1149,15 @@ that require a debhelper addon to be run during multiple builds without having to patch a large number of rules file. If at all possible, this should be avoided in favor of a --with flag in the rules file. +=item B, B, B, B, B, B, B, B, B + +By default (in any non-deprecated compat level), debhelper will automatically +set these flags by using L, when they are unset. If you +need to change the default flags, please use the features from +L to do this (e.g. B +or B) rather than setting the +concrete variable directly. + =back =head1 SEE ALSO diff --git a/debian/changelog b/debian/changelog index f7ca0916..d5fbd2c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,10 @@ debhelper (12.1.2) UNRELEASED; urgency=medium * dh_installinfo: Update NOOP PROMISE to account for dh_missing's needs. Thanks to Daniel Kahn Gillmor for reporting the issue. (Closes: #930689) + * debhelper.pod: Document that debhelper will use + dpkg-buildflags for setting CFLAGS et al and that it is + recommended to rely on dpkg-buildflags's features for + extending the default. (Closes: #923626) [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. -- cgit v1.2.3 From 3ab5772719d91057ac70b2b32fd659e016418deb Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 13 Jul 2019 14:06:29 +0000 Subject: dh_strip: Be more robust about catching errors from file(1) Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_strip | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d5fbd2c3..1c77b262 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ debhelper (12.1.2) UNRELEASED; urgency=medium dpkg-buildflags for setting CFLAGS et al and that it is recommended to rely on dpkg-buildflags's features for extending the default. (Closes: #923626) + * dh_strip: Make dh_strip more robust with issues from + file(1). Thanks to Christoph Biedl for reporting the + issue. (Closes: #931995) [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/dh_strip b/dh_strip index 06122b14..9287a0c5 100755 --- a/dh_strip +++ b/dh_strip @@ -260,12 +260,14 @@ sub write_buildid_file { sub get_file_type { my ($file, $cache_ok) = @_; return $file_output{$file} if $cache_ok && $file_output{$file}; - open (FILE, '-|') # handle all filenames safely - || exec('file', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', - '-e', 'cdf', '-e', 'compress', '-e', 'tar', $file) - || die "can't exec file: $!"; - my $type=; - close FILE; + my @cmdline = ('file', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', '-e', 'cdf', '-e', 'compress', '-e', + 'tar', $file); + + open(my $fd, '-|', @cmdline) // error("cannot fork+exec file: $!"); + my $type = <$fd>; + close($fd) || error_exitcode(escape_shell(@cmdline)); + + error("file(1) gave no result for $file!?") if (not $type) ; return $file_output{$file} = $type; } -- cgit v1.2.3 From 872bff08abd4093aa6131d952119b8ed99435973 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 13 Jul 2019 14:13:52 +0000 Subject: dh_{shlibdeps,strip}: Use file --brief and anchor output parsing regexes Signed-off-by: Niels Thykier --- debian/changelog | 5 +++++ dh_shlibdeps | 8 ++++---- dh_strip | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1c77b262..22eb7861 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,11 @@ debhelper (12.1.2) UNRELEASED; urgency=medium * dh_strip: Make dh_strip more robust with issues from file(1). Thanks to Christoph Biedl for reporting the issue. (Closes: #931995) + * dh_shlibdeps: Pass --brief to file(1) and anchor the + output parsing regex to avoid false-positive + misdetections. Thanks to Christoph Biedl for the + suggestion. (Closes: #931996) + * dh_strip: Ditto. [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/dh_shlibdeps b/dh_shlibdeps index 09ce19fd..f7d7a5cd 100755 --- a/dh_shlibdeps +++ b/dh_shlibdeps @@ -128,9 +128,9 @@ on_pkgs_in_parallel { next if $file =~ m!^\Q$tmp\E/usr/lib/debug/(lib|lib64|usr|bin|sbin|opt|dev|emul|\.build-id)/!; # TODO this is slow, optimize. Ie, file can run once on # multiple files.. - my $ff = qx_cmd('file', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', + my $ff = qx_cmd('file', '--brief', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', '-e', 'cdf', '-e', 'compress', '-e', 'tar', $file); - if ($ff =~ m/ELF/ && $ff !~ /statically linked/) { + if ($ff =~ m/^ELF/ && $ff !~ /statically linked/) { push @filelist, $file; } } @@ -158,9 +158,9 @@ on_pkgs_in_parallel { return if not is_so_or_exec_elf_file($fn); # TODO this is slow, optimize. Ie, file can run once on # multiple files.. - my $ff = qx_cmd('file', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', + my $ff = qx_cmd('file', '--brief', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', '-e', 'cdf', '-e', 'compress', '-e', 'tar', $fn); - if ($ff =~ m/ELF/ && $ff !~ /statically linked/) { + if ($ff =~ m/^ELF/ && $ff !~ /statically linked/) { push(@filelist, $fn); } }; diff --git a/dh_strip b/dh_strip index 9287a0c5..ddf1eddd 100755 --- a/dh_strip +++ b/dh_strip @@ -205,7 +205,7 @@ sub testfile { if ($fn =~ m/\.(?:so.*?|cmxs|node)$/) { # Ok, do the expensive test. my $type = get_file_type($fn, 1); - if ($type =~ m/ELF.*shared/) { + if ($type =~ m/^ELF.*shared/) { push @shared_libs, $fn; return; } @@ -215,7 +215,7 @@ sub testfile { if ($mode & 0111) { # Ok, expensive test. my $type = get_file_type($fn, 1); - if ($type =~ m/ELF.*(executable|shared)/) { + if ($type =~ m/^ELF.*(executable|shared)/) { push(@executables, $fn); return; } @@ -260,8 +260,8 @@ sub write_buildid_file { sub get_file_type { my ($file, $cache_ok) = @_; return $file_output{$file} if $cache_ok && $file_output{$file}; - my @cmdline = ('file', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', '-e', 'cdf', '-e', 'compress', '-e', - 'tar', $file); + my @cmdline = ('file', '--brief', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', '-e', 'cdf', '-e', 'compress', + '-e', 'tar', $file); open(my $fd, '-|', @cmdline) // error("cannot fork+exec file: $!"); my $type = <$fd>; -- cgit v1.2.3 From a572c04a4786eac14807611b8837db5039578ef9 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 13 Jul 2019 14:22:56 +0000 Subject: dh_installman: Improve c11 documentation Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ dh_installman | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 22eb7861..5c53e224 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,10 @@ debhelper (12.1.2) UNRELEASED; urgency=medium misdetections. Thanks to Christoph Biedl for the suggestion. (Closes: #931996) * dh_strip: Ditto. + * dh_installman: Improve documentation to be more clear + about exactly which new features dh_installman got in + compat 11. Thanks to Laurent Bigonville for pointing + out the issue. (Closes: #912999) [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/dh_installman b/dh_installman index 8adc5543..f8de7ace 100755 --- a/dh_installman +++ b/dh_installman @@ -25,9 +25,9 @@ pages into the correct locations in package build directories. In compat 10 and earlier, this program was primarily for when upstream's build system does not properly install them as a part of its install step (or it does not have an install step). In compat 11 -and later, it supports the same features of L and -has the advantage that it respects the B build profile (unlike -L). +and later, it also supports the default searchdir plus --sourcedir +like dh_install(1) and has the advantage that it respects the nodoc +build profile (unlike dh_install(1)). Even if you prefer to use L for installing the manpages, B can still be useful for converting the manpage encoding -- cgit v1.2.3 From 8409cddde729ace6dbebabcc6c01d7519154307e Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 13 Jul 2019 19:13:12 +0000 Subject: dh_{shlibdeps,strip}: Pass --no-sandbox to file under fakeroot Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ dh_shlibdeps | 5 +++-- dh_strip | 5 +++-- lib/Debian/Debhelper/Dh_Lib.pm | 19 +++++++++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5c53e224..2565eeeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,10 @@ debhelper (12.1.2) UNRELEASED; urgency=medium about exactly which new features dh_installman got in compat 11. Thanks to Laurent Bigonville for pointing out the issue. (Closes: #912999) + * dh_strip: Pass --no-sandbox to file(1) when run under + fakeroot and file(1) appear to support the option. + Thanks to Christoph Biedl for requesting the feature. + (Closes: #932006) [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/dh_shlibdeps b/dh_shlibdeps index dbc351f5..9bf3c86b 100755 --- a/dh_shlibdeps +++ b/dh_shlibdeps @@ -110,8 +110,9 @@ if (defined $dh{V_FLAG}) { on_pkgs_in_parallel { my $is_non_statically_linked_elf_file = sub { my ($file) = @_; - my $ff = qx_cmd('file', '--brief', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', - '-e', 'cdf', '-e', 'compress', '-e', 'tar', $file); + my @file_args = Debian::Debhelper::Dh_Lib::_internal_optional_file_args(); + my $ff = qx_cmd('file', @file_args, '--brief', '-e', 'apptype', '-e', 'ascii', + '-e', 'encoding', '-e', 'cdf', '-e', 'compress', '-e', 'tar', $file); return 1 if $ff =~ m/^ELF/ && $ff !~ /statically linked/; return 0; }; diff --git a/dh_strip b/dh_strip index ddf1eddd..68298c2e 100755 --- a/dh_strip +++ b/dh_strip @@ -260,8 +260,9 @@ sub write_buildid_file { sub get_file_type { my ($file, $cache_ok) = @_; return $file_output{$file} if $cache_ok && $file_output{$file}; - my @cmdline = ('file', '--brief', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', '-e', 'cdf', '-e', 'compress', - '-e', 'tar', $file); + my @file_args = Debian::Debhelper::Dh_Lib::_internal_optional_file_args(); + my @cmdline = ('file', @file_args, '--brief', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', '-e', 'cdf', + '-e', 'compress', '-e', 'tar', $file); open(my $fd, '-|', @cmdline) // error("cannot fork+exec file: $!"); my $type = <$fd>; diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm index c707197c..bfd00bb1 100644 --- a/lib/Debian/Debhelper/Dh_Lib.pm +++ b/lib/Debian/Debhelper/Dh_Lib.pm @@ -2676,4 +2676,23 @@ sub dbgsym_tmpdir { } } +{ + my $_disable_file_seccomp; + sub _internal_optional_file_args { + if (not defined($_disable_file_seccomp)) { + my $consider_disabling_seccomp = 0; + if ($ENV{'FAKEROOTKEY'} or ($ENV{'LD_PRELOAD'}//'') =~ m/fakeroot/) { + $consider_disabling_seccomp = 1; + } + if ($consider_disabling_seccomp) { + my $has_no_sandbox = (qx_cmd('file', '--help') // '') =~ m/--no-sandbox/; + $consider_disabling_seccomp = 0 if not $has_no_sandbox; + } + $_disable_file_seccomp = $consider_disabling_seccomp; + } + return ('--no-sandbox') if $_disable_file_seccomp; + return; + } +} + 1 -- cgit v1.2.3 From 396ee066a1cce696ae5410a5ccba3a7908165b0b Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 14 Jul 2019 08:23:15 +0000 Subject: Dh_Lib: Expand on substitution in maintscripts Signed-off-by: Niels Thykier --- debian/changelog | 5 +++ dh_installdeb | 48 +++++++++++++++++++++++++++++ lib/Debian/Debhelper/Dh_Lib.pm | 69 ++++++++++++++++++++++++++++-------------- 3 files changed, 99 insertions(+), 23 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2565eeeb..ce709d68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,11 @@ debhelper (12.1.2) UNRELEASED; urgency=medium fakeroot and file(1) appear to support the option. Thanks to Christoph Biedl for requesting the feature. (Closes: #932006) + * Dh_Lib.pm: Support substittuting additional variables + into the generated maintainer scripts. These include + DEB_(BUILD|HOST|TARGET)_* and ENV.* which point to the + variables from dpkg-architecture(1) and variables from + the environment (respectively). [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/dh_installdeb b/dh_installdeb index 111f3bb6..6b53cb0a 100755 --- a/dh_installdeb +++ b/dh_installdeb @@ -36,6 +36,13 @@ correct permissions. These maintainer scripts are installed into the F directory. +B will perform substitution of known tokens of +the pattern B<#TOKEN#>. In generally, scripts will want to +include the B<#DEBHELPER#> to benefit from the shell scripts +generated by debhelper commands (including those from +B when it processes I.maintscript files) + +For more information on what tokens Inside the scripts, the token B<#DEBHELPER#> is replaced with shell script snippets generated by other debhelper commands. @@ -88,6 +95,47 @@ error in compat 12. =back +=head1 SUBSTITUTION IN MAINTAINER SCRIPTS + +The B will automatically replace the following tokens +inside a provided maintainer script: + +=over 4 + +=item #DEBHELPER# + +This token is replaced with generated shell snippets debhelper +commands. This includes the snippets generated by +B from I.maintscript file (if present). + +=item #DEB_HOST_I#, #DEB_BUILD_I#, #DEB_TARGET_I# + +These tokens are replaced with the respective variable from +L. In almost all cases, you will want +use the B<< #DEB_HOST_I >> variant in a script to ensure +you get the right value when cross-building. + +On a best effort, tokens of this pattern that do not match +a variable in L will be left as-is. + +=item #ENV.I# + +These tokens of this form will be replaced with value of the +corresponding environment variable. If the environment +variable is unset, the token is replaced with the empty +string. + +Note that there are limits on which names can be used (see +L). + +=back + +=head2 Limitations in token names + +All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.]+# + +Tokens that do not match that regex will be silently ignored. + =cut init(); diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm index bfd00bb1..fe14039a 100644 --- a/lib/Debian/Debhelper/Dh_Lib.pm +++ b/lib/Debian/Debhelper/Dh_Lib.pm @@ -1998,43 +1998,66 @@ sub _concat_slurp_script_files { return $res; } +sub _substitution_generator { + my ($input) = @_; + my $cache = {}; + return sub { + my ($orig_key) = @_; + return $cache->{$orig_key} if exists($cache->{$orig_key}); + my $value = exists($input->{$orig_key}) ? $input->{$orig_key} : undef; + if (not defined($value)) { + if ($orig_key =~ m/^DEB_(?:BUILD|HOST|TARGET)_/) { + $value = dpkg_architecture_value($orig_key); + } elsif ($orig_key =~ m{^ENV[.](\S+)$}) { + $value = $ENV{$1} // ''; + } + } elsif (ref($value) eq 'CODE') { + $value = $value->($orig_key); + } elsif ($value =~ s/^@//) { + $value = _concat_slurp_script_files($value); + } + $cache->{$orig_key} = $value; + return $value; + }; +} + # Handles #DEBHELPER# substitution in a script; also can generate a new # script from scratch if none exists but there is a .debhelper file for it. sub debhelper_script_subst { - my $package=shift; - my $script=shift; - + my ($package, $script, $extra_vars) = @_; + my $tmp=tmpdir($package); my $ext=pkgext($package); my $file=pkgfile($package,$script); + my %variables = defined($extra_vars) ? %{$extra_vars} : (); my $service_script = generated_file($package, "${script}.service", 0); my @generated_scripts = ("debian/$ext$script.debhelper", $service_script); + my $subst; + @generated_scripts = grep { -f } @generated_scripts; if ($script eq 'prerm' or $script eq 'postrm') { @generated_scripts = reverse(@generated_scripts); } - @generated_scripts = grep { -f } @generated_scripts; + if (not exists($variables{'DEBHELPER'})) { + $variables{'DEBHELPER'} = sub { + return _concat_slurp_script_files(@generated_scripts); + }; + } + $subst = _substitution_generator(\%variables); if ($file ne '') { - if (@generated_scripts) { - if ($dh{VERBOSE}) { - verbose_print('cp -f ' . escape_shell($file) . " $tmp/DEBIAN/$script"); - verbose_print("perl -p -i -e \"s~#DEBHELPER#~qx{cat @generated_scripts}~eg\" $tmp/DEBIAN/$script"); - } - # Add this into the script, where it has #DEBHELPER# - my $text = _concat_slurp_script_files(@generated_scripts); - if (not $dh{NO_ACT}) { - open(my $out_fd, '>', "$tmp/DEBIAN/$script") or error("open($tmp/DEBIAN/$script) failed: $!"); - open(my $in_fd, '<', $file) or error("open($file) failed: $!"); - while (my $line = <$in_fd>) { - $line =~ s/#DEBHELPER#/$text/g; - print {$out_fd} $line; - } - close($in_fd); - close($out_fd) or error("close($tmp/DEBIAN/$script) failed: $!"); + if ($dh{VERBOSE}) { + verbose_print('cp -f ' . escape_shell($file) . " $tmp/DEBIAN/$script"); + verbose_print("[META] Replace #TOKEN#s in \"$tmp/DEBIAN/$script\""); + } + if (not $dh{NO_ACT}) { + open(my $out_fd, '>', "$tmp/DEBIAN/$script") or error("open($tmp/DEBIAN/$script) failed: $!"); + open(my $in_fd, '<', $file) or error("open($file) failed: $!"); + while (my $line = <$in_fd>) { + $line =~ s{#([A-Za-z0-9_.]+)#}{$subst->($1) // "#${1}#"}ge; + print {$out_fd} $line; } - } else { - # Just get rid of any #DEBHELPER# in the script. - doit({ stdout => "$tmp/DEBIAN/$script" }, 'sed', 's/#DEBHELPER#//', $file); + close($in_fd); + close($out_fd) or error("close($tmp/DEBIAN/$script) failed: $!"); } reset_perm_and_owner('0755', "$tmp/DEBIAN/$script"); } -- cgit v1.2.3 From c80a2acf91730e65b2460162d943706e37a26050 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 14 Jul 2019 08:41:20 +0000 Subject: Add a -D/--define parameter to dh_installdeb Signed-off-by: Niels Thykier --- debian/changelog | 5 ++++- dh_installdeb | 44 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ce709d68..cef4d571 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,11 +37,14 @@ debhelper (12.1.2) UNRELEASED; urgency=medium fakeroot and file(1) appear to support the option. Thanks to Christoph Biedl for requesting the feature. (Closes: #932006) - * Dh_Lib.pm: Support substittuting additional variables + * Dh_Lib.pm: Support substituting additional variables into the generated maintainer scripts. These include DEB_(BUILD|HOST|TARGET)_* and ENV.* which point to the variables from dpkg-architecture(1) and variables from the environment (respectively). + * dh_installdeb: Support additional substitution variables + on the commandline via -DTOKEN=VALUE to replace #TOKEN# + with VALUE. (Closes: #25235) [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/dh_installdeb b/dh_installdeb index 6b53cb0a..7c20f291 100755 --- a/dh_installdeb +++ b/dh_installdeb @@ -95,16 +95,41 @@ error in compat 12. =back +=head1 OPTIONS + +=over 4 + +=item B<-D>I, B<--define> I + +Request that B<< #I# >> in the maintainer script is replaced +by I. If I starts with a literal I<@>-sign, then +I is expected to point to a file containing the actual value +to insert. + +An explicit declared token with this parameter will replace built-in +tokens. + +Test examples to aid with the understanding: + + cat >> debian/postinst < some-file + dh_installdeb --define SIMPLE=direct --define FILEBASED=@some-file + +=back + =head1 SUBSTITUTION IN MAINTAINER SCRIPTS The B will automatically replace the following tokens -inside a provided maintainer script: +inside a provided maintainer script (if not replaced via B<-D>/B<--define>): =over 4 =item #DEBHELPER# -This token is replaced with generated shell snippets debhelper +This token is by default replaced with generated shell snippets debhelper commands. This includes the snippets generated by B from I.maintscript file (if present). @@ -128,6 +153,11 @@ string. Note that there are limits on which names can be used (see L). +=item #PACKAGE# + +This token is by default replaced the package name, which will contain +the concrete script. + =back =head2 Limitations in token names @@ -138,7 +168,11 @@ Tokens that do not match that regex will be silently ignored. =cut -init(); +my %PROVIDED_SUBST; + +init(options => { + 'define|D=s%' => \%PROVIDED_SUBST, +}); # dpkg-maintscript-helper commands with their associated dpkg pre-dependency # versions. @@ -220,8 +254,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } # Install debian scripts. + my %package_subst = %PROVIDED_SUBST; + $package_subst{'PACKAGE'} = $package if not exists($package_subst{'PACKAGE'}); foreach my $script (qw{postinst preinst prerm postrm}) { - debhelper_script_subst($package, $script); + debhelper_script_subst($package, $script, \%package_subst); } # Install non-executable files -- cgit v1.2.3 From e5fc959e3b97a0d3821aec43c8a4d2aed212dae6 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Thu, 17 Jan 2019 02:19:27 +0000 Subject: dh_installinit: --name implies, that init script is present Previously, `dh_installinit' silently did nothing, when --name option was passed, but initscript debian/..init was not found. In almost all cases, explicit --name means that package maintainer meant to install init script. If it is not present, it is bug, and must not be hidden. Now, error is reported in this case. (Closes: #462389) Signed-off-by: Niels Thykier --- debian/changelog | 5 +++++ dh_installinit | 4 ++++ t/dh_installinit/dh_installinit.t | 1 + 3 files changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cef4d571..57ffa3c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,11 @@ debhelper (12.1.2) UNRELEASED; urgency=medium * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. (Closes: #926815) + [ Dmitry Bogatov ] + * dh_installinit: Fail with an error if --name is given but + there is no matching init script. Thanks to A Mennucc + for reporting the issue. (Closes: #462389) + [ Translations ] * Update Portuguese translation (Américo Monteiro) (Closes: #886279) diff --git a/dh_installinit b/dh_installinit index fca0a8af..6a490370 100755 --- a/dh_installinit +++ b/dh_installinit @@ -311,6 +311,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $init=pkgfile($package,$scriptsrc) || pkgfile($package,"init") || pkgfile($package,"init.d"); + if (!$init && defined $dh{NAME}) { + error("--name=$dh{NAME} option specified, but init script not found"); + } + if ($init ne '' && ! $dh{ONLYSCRIPTS}) { install_dir("$tmp/etc/init.d"); install_prog($init,"$tmp/etc/init.d/$script"); diff --git a/t/dh_installinit/dh_installinit.t b/t/dh_installinit/dh_installinit.t index b20caa58..afe3821f 100755 --- a/t/dh_installinit/dh_installinit.t +++ b/t/dh_installinit/dh_installinit.t @@ -29,6 +29,7 @@ each_compat_from_and_above_subtest(11, sub { make_path(qw(debian/foo debian/bar debian/baz)); ok(run_dh_tool('dh_installinit')); + ok(! run_dh_tool({'quiet' => 1}, 'dh_installinit', '--name=missing')); ok(! -e "debian/foo/lib/systemd/system/foo.service"); ok(!find_script('foo', 'postinst')); ok(run_dh_tool('dh_clean')); -- cgit v1.2.3 From e24b856ce24c5bc4d7348b59f05330723d5f8903 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 14 Jul 2019 10:24:33 +0000 Subject: Bump Standards-Versions to 4.4.0 Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 57ffa3c5..63ba2528 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,8 @@ debhelper (12.1.2) UNRELEASED; urgency=medium * dh_installdeb: Support additional substitution variables on the commandline via -DTOKEN=VALUE to replace #TOKEN# with VALUE. (Closes: #25235) + * d/control: Bump Standards-Version to 4.4.0 - no changes + required. [ Helmut Grohne ] * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el. diff --git a/debian/control b/debian/control index 2ebf8d01..cf598526 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: dpkg-dev (>= 1.18.0~), perl:any, po4a, Rules-Requires-Root: no -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Testsuite: autopkgtest-pkg-perl Vcs-Git: https://salsa.debian.org/debian/debhelper.git Vcs-Browser: https://salsa.debian.org/debian/debhelper -- cgit v1.2.3 From 3ac9a5c3c5dd725d8269a3dbd4575c646008769b Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 14 Jul 2019 10:29:35 +0000 Subject: Release debhelper/12.2 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 63ba2528..9ec72305 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.1.2) UNRELEASED; urgency=medium +debhelper (12.2) unstable; urgency=medium [ Niels Thykier ] * Dh_Lib: Ensure the error function always triggers the same @@ -61,7 +61,7 @@ debhelper (12.1.2) UNRELEASED; urgency=medium * Update Portuguese translation (Américo Monteiro) (Closes: #886279) - -- Niels Thykier Mon, 25 Feb 2019 07:23:03 +0000 + -- Niels Thykier Sun, 14 Jul 2019 10:29:20 +0000 debhelper (12.1.1) unstable; urgency=medium -- cgit v1.2.3 From 7e7931ff1623d288b03fe06ad4ba7d10700ec67d Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 16 Jul 2019 20:21:30 +0000 Subject: d/changelog: Document recent changes Signed-off-by: Niels Thykier --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9ec72305..ad9b1f2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +debhelper (12.2.1) UNRELEASED; urgency=medium + + [ Dmitry Bogatov ] + * dh_installinit: Fix regression where dh_installinit bailed + out on --name if only one of the acted on packages had an + init script file. Thanks to Helmut Grohne for reporting + the issue. (Closes: #932073) + + -- Niels Thykier Tue, 16 Jul 2019 20:19:52 +0000 + debhelper (12.2) unstable; urgency=medium [ Niels Thykier ] -- cgit v1.2.3 From 50f6eb14c78dfa57a5935f17246817074406a69f Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 16 Jul 2019 20:22:39 +0000 Subject: Release debhelper/12.2.1 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ad9b1f2d..689e1426 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.2.1) UNRELEASED; urgency=medium +debhelper (12.2.1) unstable; urgency=medium [ Dmitry Bogatov ] * dh_installinit: Fix regression where dh_installinit bailed @@ -6,7 +6,7 @@ debhelper (12.2.1) UNRELEASED; urgency=medium init script file. Thanks to Helmut Grohne for reporting the issue. (Closes: #932073) - -- Niels Thykier Tue, 16 Jul 2019 20:19:52 +0000 + -- Niels Thykier Tue, 16 Jul 2019 20:21:32 +0000 debhelper (12.2) unstable; urgency=medium -- cgit v1.2.3 From 7504d32fc30a7d99a5c4fad17f5f0bf35498c579 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 16 Jul 2019 21:02:15 +0000 Subject: dh_{shlibdeps,strip}: Remove regex anchor to fix regression Signed-off-by: Niels Thykier --- debian/changelog | 9 +++++++++ dh_shlibdeps | 2 +- dh_strip | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 689e1426..3553165a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +debhelper (12.2.2) UNRELEASED; urgency=medium + + * dh_shlibdeps: Remove regex anchor when parsing file(1) to aovid + regressions with setuid/setgid binaries. Thanks to James + Cowgill for reporting the issue. (Closes: #932240) + * dh_strip: Ditto. + + -- Niels Thykier Tue, 16 Jul 2019 21:02:21 +0000 + debhelper (12.2.1) unstable; urgency=medium [ Dmitry Bogatov ] diff --git a/dh_shlibdeps b/dh_shlibdeps index 9bf3c86b..35a7fc48 100755 --- a/dh_shlibdeps +++ b/dh_shlibdeps @@ -113,7 +113,7 @@ on_pkgs_in_parallel { my @file_args = Debian::Debhelper::Dh_Lib::_internal_optional_file_args(); my $ff = qx_cmd('file', @file_args, '--brief', '-e', 'apptype', '-e', 'ascii', '-e', 'encoding', '-e', 'cdf', '-e', 'compress', '-e', 'tar', $file); - return 1 if $ff =~ m/^ELF/ && $ff !~ /statically linked/; + return 1 if $ff =~ m/ELF/ && $ff !~ /statically linked/; return 0; }; diff --git a/dh_strip b/dh_strip index 68298c2e..3e8b300f 100755 --- a/dh_strip +++ b/dh_strip @@ -205,7 +205,7 @@ sub testfile { if ($fn =~ m/\.(?:so.*?|cmxs|node)$/) { # Ok, do the expensive test. my $type = get_file_type($fn, 1); - if ($type =~ m/^ELF.*shared/) { + if ($type =~ m/ELF.*shared/) { push @shared_libs, $fn; return; } @@ -215,7 +215,7 @@ sub testfile { if ($mode & 0111) { # Ok, expensive test. my $type = get_file_type($fn, 1); - if ($type =~ m/^ELF.*(executable|shared)/) { + if ($type =~ m/ELF.*(executable|shared)/) { push(@executables, $fn); return; } -- cgit v1.2.3 From f8ad9cd445f0e5722b60c678dde120400079bfc0 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 16 Jul 2019 21:03:52 +0000 Subject: Release debhelper/12.2.2 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3553165a..77869569 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -debhelper (12.2.2) UNRELEASED; urgency=medium +debhelper (12.2.2) unstable; urgency=medium * dh_shlibdeps: Remove regex anchor when parsing file(1) to aovid regressions with setuid/setgid binaries. Thanks to James Cowgill for reporting the issue. (Closes: #932240) * dh_strip: Ditto. - -- Niels Thykier Tue, 16 Jul 2019 21:02:21 +0000 + -- Niels Thykier Tue, 16 Jul 2019 21:03:38 +0000 debhelper (12.2.1) unstable; urgency=medium -- cgit v1.2.3 From 38fcef8ad314aeedd1c698d8bb697158286cf989 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 19 Jul 2019 18:29:26 +0000 Subject: dh_installinit: Revert check to ensure --name always matches a file Signed-off-by: Niels Thykier --- debian/changelog | 8 ++++++++ dh_installinit | 6 ------ t/dh_installinit/dh_installinit.t | 1 - 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 77869569..f6cddf42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (12.2.3) UNRELEASED; urgency=medium + + * dh_installinit: Revert "Fail with an error if --name is given but + there is no matching init script.". (Closes: #932073, + Reopens: #462389) + + -- Niels Thykier Fri, 19 Jul 2019 18:27:41 +0000 + debhelper (12.2.2) unstable; urgency=medium * dh_shlibdeps: Remove regex anchor when parsing file(1) to aovid diff --git a/dh_installinit b/dh_installinit index 5aecf25b..fca0a8af 100755 --- a/dh_installinit +++ b/dh_installinit @@ -232,12 +232,6 @@ init(options => { my %snippet_options = ('snippet-order' => 'service'); -if (my $name = $dh{NAME}) { - if (!grep { -f "debian/$_.${name}.init" || -f "debian/$_.${name}.default" } @{$dh{DOPACKAGES}}) { - error("--name=$dh{NAME} option specified, but init script nor default file not found"); - } -} - foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp=tmpdir($package); diff --git a/t/dh_installinit/dh_installinit.t b/t/dh_installinit/dh_installinit.t index 3b6bc038..cfc154a7 100755 --- a/t/dh_installinit/dh_installinit.t +++ b/t/dh_installinit/dh_installinit.t @@ -30,7 +30,6 @@ each_compat_from_and_above_subtest(11, sub { make_path(qw(debian/foo debian/bar debian/baz)); ok(run_dh_tool('dh_installinit')); - ok(! run_dh_tool({'quiet' => 1}, 'dh_installinit', '--name=missing')); ok( run_dh_tool({'queit' => 1}, 'dh_installinit', '--name=other')); ok(! -e "debian/foo/lib/systemd/system/foo.service"); ok(!find_script('foo', 'postinst')); -- cgit v1.2.3 From 10e848e82be27e8f8be2555a5aef50c44609bc2a Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 19 Jul 2019 19:02:51 +0000 Subject: Dh_Getopt.pm: Improve warning when -p is ignoring in overrides Signed-off-by: Niels Thykier --- debian/changelog | 5 +++++ lib/Debian/Debhelper/Dh_Getopt.pm | 25 ++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f6cddf42..b9c7991b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ debhelper (12.2.3) UNRELEASED; urgency=medium * dh_installinit: Revert "Fail with an error if --name is given but there is no matching init script.". (Closes: #932073, Reopens: #462389) + * Dh_Getopt.pm: Produce a better error message when -p is + ignored in an architecture constrained override (e.g. during an + architecture specific build and the -p argument refers to an + arch:all package). Thanks to Helmut Grohne for reporting the + issue. (Closes: #932262) -- Niels Thykier Fri, 19 Jul 2019 18:27:41 +0000 diff --git a/lib/Debian/Debhelper/Dh_Getopt.pm b/lib/Debian/Debhelper/Dh_Getopt.pm index f8ab8eb7..a35d9588 100644 --- a/lib/Debian/Debhelper/Dh_Getopt.pm +++ b/lib/Debian/Debhelper/Dh_Getopt.pm @@ -11,7 +11,8 @@ use warnings; use Debian::Debhelper::Dh_Lib; use Getopt::Long; -my (%exclude_package, %profile_enabled_packages, $profile_excluded_pkg); +my (%exclude_package, %internal_excluded_package, %explicitly_reqested_packages, %profile_enabled_packages, + $profile_excluded_pkg); sub showhelp { my $prog=basename($0); @@ -43,6 +44,7 @@ sub AddPackage { my($option,$value)=@_; elsif ($option eq 'p' or $option eq 'package') { assert_opt_is_known_package($value, '-p/--package'); %profile_enabled_packages = map { $_ => 1 } getpackages('both') if not %profile_enabled_packages; + $explicitly_reqested_packages{$value} = 1; # Silently ignore packages that are not enabled by the # profile. if (exists($profile_enabled_packages{$value})) { @@ -215,7 +217,8 @@ sub parseopts { if (defined $dh{DOPACKAGES}) { foreach my $package (getpackages()) { if (! grep { $_ eq $package } @{$dh{DOPACKAGES}}) { - $exclude_package{$package}=1; + $exclude_package{$package} = 1; + $internal_excluded_package{$package} = 1; } } } @@ -293,10 +296,26 @@ sub parseopts { if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) { if (! $dh{BLOCK_NOOP_WARNINGS}) { my %archs; + if (%explicitly_reqested_packages) { + # Avoid sending a confusing error message when debhelper must exclude a package given via -p. + # This commonly happens due to Build-Profiles or/and when build only a subset of the packages + # (e.g. dpkg-buildpackage -A vs. -B vs. none of the options) + for my $pkg (sort(keys(%explicitly_reqested_packages))) { + if (exists($internal_excluded_package{$pkg}) or not exists($profile_enabled_packages{$pkg})) { + delete($explicitly_reqested_packages{$pkg}); + } + } + if (not %explicitly_reqested_packages) { + warning('All requested packages have been excluded' + . ' (e.g. via a Build-Profile or due to architecture restrictions).'); + exit(0); + } + } for my $pkg (getpackages()) { $archs{package_declared_arch($pkg)} = 1; } - warning("No packages to build. Architecture mismatch: " . hostarch() . ", want: " . join(" ", sort keys %archs)); + warning("No packages to build. Possible architecture mismatch: " . hostarch() . + ", want: " . join(" ", sort keys %archs)); } exit(0); } -- cgit v1.2.3 From 793127db6578860ef9b5edcd96a46b944d5cab89 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 19 Jul 2019 19:26:07 +0000 Subject: Release debhelper/12.2.3 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b9c7991b..435c851c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.2.3) UNRELEASED; urgency=medium +debhelper (12.2.3) unstable; urgency=medium * dh_installinit: Revert "Fail with an error if --name is given but there is no matching init script.". (Closes: #932073, @@ -9,7 +9,7 @@ debhelper (12.2.3) UNRELEASED; urgency=medium arch:all package). Thanks to Helmut Grohne for reporting the issue. (Closes: #932262) - -- Niels Thykier Fri, 19 Jul 2019 18:27:41 +0000 + -- Niels Thykier Fri, 19 Jul 2019 19:18:03 +0000 debhelper (12.2.2) unstable; urgency=medium -- cgit v1.2.3 From 6ba56fe984a22f71a1cfa937a7a5f08ebed661ac Mon Sep 17 00:00:00 2001 From: Américo Monteiro Date: Sat, 20 Jul 2019 07:22:17 +0000 Subject: Update on Portuguese translation of manpage Signed-off-by: Niels Thykier --- debian/changelog | 7 + man/po4a/po/pt.po | 761 ++++++++++++++++++++++++------------------------------ 2 files changed, 347 insertions(+), 421 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 435c851c..92972c11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (12.2.4) UNRELEASED; urgency=medium + + [ Translations ] + * Update Portuguese translation (Américo Monteiro) (Closes: #927394) + + -- Niels Thykier Sat, 20 Jul 2019 07:20:56 +0000 + debhelper (12.2.3) unstable; urgency=medium * dh_installinit: Revert "Fail with an error if --name is given but diff --git a/man/po4a/po/pt.po b/man/po4a/po/pt.po index 96192553..efbaa9dd 100644 --- a/man/po4a/po/pt.po +++ b/man/po4a/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: debhelper 12.1.1\n" "Report-Msgid-Bugs-To: debhelper@packages.debian.org\n" -"POT-Creation-Date: 2019-07-14 10:09+0000\n" +"POT-Creation-Date: 2019-02-09 17:11+0100\n" "PO-Revision-Date: 2019-04-18 22:49+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese <>\n" @@ -140,6 +140,11 @@ msgstr "" #. type: textblock #: debhelper.pod:31 +#| msgid "" +#| "Except where tool explicitly denotes otherwise, all of the debhelper " +#| "tools assumes that they run from root directory of an unpacked source " +#| "package. This is so they can locate find F and F when needed." msgid "" "Except where tool explicitly denotes otherwise, all of the debhelper tools " "assumes that they run from root directory of an unpacked source package. " @@ -300,11 +305,12 @@ msgid "" "The syntax of these files is intentionally kept very simple to make them " "easy to read, understand, and modify." msgstr "" -"A sintaxe destes ficheiros é mantida intencionalmente muito simples para os " -"tornar fáceis de ler, compreender e modificar." +"A sintaxe destes ficheiros é mantida intencionalmente muito simples para " +"os tornar fáceis de ler, compreender e modificar." #. type: =head2 #: debhelper.pod:104 +#| msgid "Comments are ignored in debhelper config files." msgid "Executable debhelper config files" msgstr "Ficheiros de configuração do debhelper executáveis." @@ -315,8 +321,8 @@ msgid "" "L) support executing a config file as a script." msgstr "" "Se precisar de flexibilidade adicional, muitas das ferramentas debhelper " -"(ex, L) suportam executar um ficheiro de configuração como um " -"script." +"(ex, L) suportam executar um ficheiro de configuração como " +"um script." #. type: textblock #: debhelper.pod:109 @@ -327,9 +333,9 @@ msgid "" "exec(1)> as interpreter of the config file to retain most of the original " "syntax while getting the additional flexibility you need." msgstr "" -"Para usar esta funcionalidade, simplesmente marque o ficheiro de " -"configuração como executável (ex. B<< chmod +x debian/I.install >>) " -"e a ferramenta irá tentar executá-lo e usar o resultado do script. Em muitos " +"Para usar esta funcionalidade, simplesmente marque o ficheiro de configuração " +"como executável (ex. B<< chmod +x debian/I.install >>) e a " +"ferramenta irá tentar executá-lo e usar o resultado do script. Em muitos " "casos, você pode usar L como interpretador do ficheiro de " "configuração para reter a maioria da sintaxe original enquanto obtém a " "flexibilidade adicional que precisa." @@ -354,8 +360,8 @@ msgid "" "The executable config file B exit with success (i.e. its return code " "should indicate success)." msgstr "" -"O ficheiro de configuração executável B termina com sucesso (isto é, o " -"seu código de retorne deve indicar sucesso)." +"O ficheiro de configuração executável B termina com sucesso (isto é, " +"o seu código de retorne deve indicar sucesso)." #. type: textblock #: debhelper.pod:129 @@ -363,9 +369,9 @@ msgid "" "The output will be used exactly as it is. Notably, debhelper will I " "expand wildcards or strip comments in the output." msgstr "" -"O resultado de saída irá ser usado exactamente como está. De notar que o " -"debhelper I irá expandir wildcards ou retirar comentários ao resultado " -"de saída." +"O resultado de saída irá ser usado exactamente como está. De notar que " +"o debhelper I irá expandir wildcards ou retirar comentários ao " +"resultado de saída." #. type: textblock #: debhelper.pod:134 @@ -468,6 +474,7 @@ msgstr "Alias descontinuado de B<-a>." #. type: textblock #: debhelper.pod:171 dh_install:77 dh_install:86 +#| msgid "The option is removed in compat 12." msgid "This option is removed in compat 12." msgstr "Esta opção foi removida no nível de compatibilidade 12." @@ -618,14 +625,18 @@ msgstr "B<-X>I, B<--exclude=>I" #. type: textblock #: debhelper.pod:230 +#| msgid "" +#| "Exclude an item from processing. This option may be used multiple times, " +#| "to exclude more than one thing. The \\fIitem\\fR is typically part of a " +#| "filename, and any file containing the specified text will be excluded." msgid "" "Exclude an item from processing. This option may be used multiple times, to " "exclude more than one thing. The I is typically part of a filename, " "and any file containing the specified text will be excluded." msgstr "" "Exclui um item do processamento. Esta opção pode ser usada várias vezes, " -"para excluir mais do que uma coisa. O I é tipicamente parte de um nome " -"de ficheiro, e qualquer ficheiro que contenha o texto especificado será " +"para excluir mais do que uma coisa. O I é tipicamente parte de um " +"nome de ficheiro, e qualquer ficheiro que contenha o texto especificado será " "excluído." #. type: =item @@ -835,6 +846,15 @@ msgstr "NÍVEIS DE COMPATIBILIDADE" #. type: textblock #: debhelper.pod:315 +#| msgid "" +#| "From time to time, major non-backwards-compatible changes need to be made " +#| "to debhelper, to keep it clean and well-designed as needs change and its " +#| "author gains more experience. To prevent such major changes from breaking " +#| "existing packages, the concept of debhelper compatibility levels was " +#| "introduced. You must tell debhelper which compatibility level it should " +#| "use, and it modifies its behavior in various ways. The compatibility " +#| "level is specified in the F file and the file must be " +#| "present." msgid "" "From time to time, major non-backwards-compatible changes need to be made to " "debhelper, to keep it clean and well-designed as needs change and its author " @@ -853,6 +873,9 @@ msgstr "" #. type: textblock #: debhelper.pod:322 +#| msgid "" +#| "Tell debhelper what compatibility level to use by writing a number to " +#| "F. For example, to use v#RECOMMENDED_COMPAT# mode:" msgid "" "In current debhelper, you can specify the compatibility level in F by adding a Build-Depends on the debhelper-compat package. For " @@ -860,12 +883,15 @@ msgid "" msgstr "" "No debhelper actual, você pode especificar o nível de compatibilidade em " "F ao adicionar um Build-Depends no pacote debhelper-compat. " -"Por exemplo, para usar modo v#RECOMMENDED_COMPAT#, assegure que F tem:" +"Por exemplo, para usar modo v#RECOMMENDED_COMPAT#, assegure que " +"F tem:" #. type: verbatim #: debhelper.pod:326 #, no-wrap +#| msgid "" +#| " Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#)\n" +#| "\n" msgid "" " Build-Depends: debhelper-compat (= #RECOMMENDED_COMPAT#)\n" "\n" @@ -916,20 +942,23 @@ msgid "" msgstr "" "As versões anteriores do debhelper requeriam o nível de compatibilidade " "especificado no ficheiro F, e o debhelper actual ainda " -"suporta isto para compatibilidade com as versões anteriores, apesar de um " -"pacote não poder especificar um nível de compatibilidade via múltiplos " -"métodos de uma vez. Para usar este método, F deve conter o " -"nível de compatibilidade como um número singular, e nenhum outro conteúdo. " +"suporta isto para compatibilidade com as versões anteriores, apesar de " +"um pacote não poder especificar um nível de compatibilidade via múltiplos " +"métodos de uma vez. Para usar este método, F deve conter " +"o nível de compatibilidade como um número singular, e nenhum outro conteúdo. " "Se você especificar o nível de compatibilidade neste método, o seu pacote " -"vai também precisar duma dependência de compilação baseada em versão de uma " -"versão do pacote debhelper igual (ou superior) ao nível de compatibilidade " -"que o seu pacote usa. Assim, se você especificar o nível de compatibilidade " -"#RECOMMENDED_COMPAT# em F, assegure-se que F " -"tem:" +"vai também precisar duma dependência de compilação baseada em versão de " +"uma versão do pacote debhelper igual (ou superior) ao nível de " +"compatibilidade que o seu pacote usa. Assim, se você especificar o nível " +"de compatibilidade #RECOMMENDED_COMPAT# em F, assegure-se " +"que F tem:" #. type: verbatim #: debhelper.pod:349 #, no-wrap +#| msgid "" +#| " Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#)\n" +#| "\n" msgid "" " Build-Depends: debhelper (>= #RECOMMENDED_COMPAT#~)\n" "\n" @@ -1470,6 +1499,11 @@ msgstr "" #. type: textblock #: debhelper.pod:631 +#| msgid "" +#| "B no longer creates the package build directory when skipping running " +#| "debhelper commands. This will not affect packages that only build with " +#| "debhelper commands, but it may expose bugs in commands not included in " +#| "debhelper." msgid "" "B: B no longer creates the package build " "directory when skipping running debhelper commands. This will not affect " @@ -1477,9 +1511,9 @@ msgid "" "commands not included in debhelper." msgstr "" "B B já não cria o directório de compilação " -"do pacote quando salta a execução de comandos debhelper. Isto não vai " -"afectar pacotes que apenas compilam com comandos debhelper, mas pode expor " -"bugs em comandos não incluídos no debhelper." +"do pacote quando salta a execução de comandos debhelper. Isto não vai afectar " +"pacotes que apenas compilam com comandos debhelper, mas pode expor bugs " +"em comandos não incluídos no debhelper." #. type: textblock #: debhelper.pod:636 @@ -1489,9 +1523,9 @@ msgid "" "there has been no reports of issues caused by this bug in those ~5 years, " "this item have been removed rather than fixed." msgstr "" -"Esta funcionalidade de compatibilidade tinha um bug desde a sua inserção no " -"debhelper/9.20130516 que o fazia falhar ao aplicar em compatibilidade 9 e " -"anteriores. Como não tem havido relatórios de problemas causados por este " +"Esta funcionalidade de compatibilidade tinha um bug desde a sua inserção " +"no debhelper/9.20130516 que o fazia falhar ao aplicar em compatibilidade 9 " +"e anteriores. Como não tem havido relatórios de problemas causados por este " "bug nesses -5 anos, este item foi removido em vez de corrigido." #. type: =item @@ -1555,6 +1589,10 @@ msgstr "A grande maioria dos pacotes não serão afectados por esta alteração. #. type: textblock #: debhelper.pod:677 +#| msgid "" +#| "The B buildsystem now passes B to L. Derivative buildsystems (e.g. B " +#| "or B) are unaffected by this change." msgid "" "The B buildsystem now passes B to L. Derivative buildsystems (e.g. B " @@ -1703,9 +1741,9 @@ msgid "" "I of the documentation in a different path to comply with the " "recommendation from Debian policy §12.3 (since version 3.9.7)." msgstr "" -"As ferramentas B e B podem agora " -"instalar I da documentação num caminho diferente para cumprir com " -"a recomendação da política Debian §12.3 (desde versão 3.9.7)." +"As ferramentas B e B podem agora instalar " +"I da documentação num caminho diferente para cumprir com a " +"recomendação da política Debian §12.3 (desde versão 3.9.7)." #. type: textblock #: debhelper.pod:754 @@ -1715,8 +1753,8 @@ msgid "" "change is not relevant for that source package and you can skip to the next " "change." msgstr "" -"Note que um dado pacote fonte apenas contém um único pacote binário em " -"F ou nenhum dos pacotes são pacotes I<-doc>, então esta " +"Note que um dado pacote fonte apenas contém um único pacote binário " +"em F ou nenhum dos pacotes são pacotes I<-doc>, então esta " "alteração não é relevante para esse pacote fonte e você pode saltar a " "próxima alteração." @@ -1733,20 +1771,23 @@ msgstr "" "Por predefinição, estas ferramentas irão agora tentar determinar um \"pacote " "principal para a documentação\" (chamado um I daqui em " "diante) para cada pacote I<-doc>. Se encontrarem o tal I, " -"irão agora instalar a documentação em F<< /usr/share/doc/I " -">> no pacote doc fornecido. Isto é, o caminho pode mudar mas a documentação " -"será na mesma enviada no pacote I<-doc>." +"irão agora instalar a documentação em F<< /usr/share/doc/I >> no pacote doc fornecido. Isto é, o caminho pode mudar mas a " +"documentação será na mesma enviada no pacote I<-doc>." #. type: textblock #: debhelper.pod:767 +#| msgid "" +#| "The B<--doc-main-package> option can be used when the auto-detection is " +#| "insufficient." msgid "" "The B<--doc-main-package> option can be used when the auto-detection is " "insufficient or to reset the path to its previous value if there is a reason " "to diverge from Debian policy recommendation." msgstr "" "A opção B<--doc-main-package> pode ser usada quando a auto-detecção é " -"insuficiente ou para reiniciar o caminho para o seu valor anterior se " -"existir razão para divergir da recomendação da politica Debian." +"insuficiente ou para reiniciar o caminho para o seu valor anterior se existir " +"razão para divergir da recomendação da politica Debian." #. type: textblock #: debhelper.pod:771 @@ -1757,8 +1798,8 @@ msgid "" msgstr "" "Alguma documentação não será afectada por esta alteração. Estas excepções " "incluem o ficheiro copyright, ficheiros changelog, README.Debian, etc. Estes " -"ficheiros serão na mesma instalados no caminho F<< /usr/share/doc/I " -">>." +"ficheiros serão na mesma instalados no caminho " +"F<< /usr/share/doc/I >>." #. type: textblock #: debhelper.pod:778 @@ -1802,9 +1843,9 @@ msgid "" "dependency by default. This means that B<-VUpstream-Version> (a.k.a. B<-V>) " "is now the default." msgstr "" -"A ferramenta B agora gera ficheiros shlibs com dependência de " -"versão por predefinição. Isto significa que B<-VUpstream-Version> (a.k.a. B<-" -"V>) é agora a predefinição." +"A ferramenta B agora gera ficheiros shlibs com dependência " +"de versão por predefinição. Isto significa que B<-VUpstream-Version> " +"(a.k.a. B<-V>) é agora a predefinição." #. type: textblock #: debhelper.pod:801 @@ -1814,8 +1855,8 @@ msgid "" "L for the caveat of unversioned dependencies." msgstr "" "Se é pedida uma dependência sem versão no ficheiros shlibs, isto pode ser " -"conseguido ao passar B<-VNone> em substituição. No entanto, por favor veja " -"L para a problemática das dependências sem versão." +"conseguido ao passar B<-VNone> em substituição. No entanto, por favor " +"veja L para a problemática das dependências sem versão." #. type: textblock #: debhelper.pod:807 @@ -1928,8 +1969,8 @@ msgid "" "override target for them in F (e.g. I)" msgstr "" "A sequência standard em B agora inclui B e " -"B por predefinição. Isto tornas as sequências B e " -"B obsoletas e elas agora irão falhar com um erro. Se " +"B por predefinição. Isto tornas as sequências B " +"e B obsoletas e elas agora irão falhar com um erro. Se " "desejar saltar estes comandos, por favor insira um alvo de sobreposição " "vazio para eles em F (ex. I)" @@ -1959,6 +2000,10 @@ msgstr "" #. type: verbatim #: debhelper.pod:880 #, no-wrap +#| msgid "" +#| "\toverride_dh_auto_configure:\n" +#| "\t\tdh_auto_configure -- --with-foo --disable-bar\n" +#| "\n" msgid "" " override_dh_auto_configure:\n" " \tdh_auto_configure -- --libexecdir=/usr/libexec\n" @@ -1996,8 +2041,8 @@ msgid "" msgstr "" "A ferramenta B não mais se apoia em B " "para lidar com os serviços do systemd que têm uma alternativa de sysvinit. " -"ambas ferramentas devem agora ser usadas em tais casos para assegurar que o " -"serviço é arrancado correctamente sob ambos sysvinit e systemd." +"ambas ferramentas devem agora ser usadas em tais casos para assegurar que " +"o serviço é arrancado correctamente sob ambos sysvinit e systemd." #. type: textblock #: debhelper.pod:899 @@ -2005,8 +2050,8 @@ msgid "" "If you have an override for B (e.g. to call it with B<--no-" "start>) then you will probably need one for B as well now." msgstr "" -"Se tiver uma sobreposição para B (ex. para chamá-lo com B<--" -"no-start>) então irá provavelmente precisar agora também de um para " +"Se tiver uma sobreposição para B (ex. para chamá-lo com " +"B<--no-start>) então irá provavelmente precisar agora também de um para " "B." #. type: textblock @@ -2018,8 +2063,8 @@ msgid "" "12." msgstr "" "Esta alteração faz B injectar um I para " -"B<< init-system-helpers (>= 1.54~) >>. Por favor assegure que o pacote " -"lista B<${misc:Pre-Depends}> no seu campo B antes de actualizar " +"B<< init-system-helpers (>= 1.54~) >>. Por favor assegure que o pacote lista " +"B<${misc:Pre-Depends}> no seu campo B antes de actualizar " "para a compatibilidade 12." #. type: textblock @@ -2044,8 +2089,8 @@ msgid "" "B is now included in the B standard sequence by " "default." msgstr "" -"B é agora incluído na sequência standard do B por " -"predefinição." +"B é agora incluído na sequência standard do B " +"por predefinição." #. type: textblock #: debhelper.pod:923 @@ -2058,6 +2103,7 @@ msgstr "" #. type: =item #: debhelper.pod:928 +#| msgid "v1" msgid "v13" msgstr "v13" @@ -2071,6 +2117,7 @@ msgstr "" #. type: textblock #: debhelper.pod:932 +#| msgid "Changes from v10 are:" msgid "Changes from v12 are:" msgstr "As alterações a partir de v12 são:" @@ -2495,14 +2542,17 @@ msgstr "B" #. type: textblock #: debhelper.pod:1108 +#| msgid "" +#| "Temporarily specifies what compatibility level debhelper should run at, " +#| "overriding any value in F." msgid "" "Temporarily specifies what compatibility level debhelper should run at, " "overriding any value specified via Build-Depends on debhelper-compat or via " "the F file." msgstr "" "Especifica temporariamente em que nível de compatibilidade o debhelper deve " -"correr, sobrepondo qualquer valor especificado via Build-Depend em debhelper-" -"compat ou via ficheiro F." +"correr, sobrepondo qualquer valor especificado via Build-Depend em " +"debhelper-compat ou via ficheiro F." #. type: =item #: debhelper.pod:1112 @@ -2583,6 +2633,7 @@ msgstr "" #. type: =item #: debhelper.pod:1140 +#| msgid "B" msgid "B" msgstr "B" @@ -2596,9 +2647,9 @@ msgid "" msgstr "" "Se definido, isto adiciona os addons especificados do dh para serem corridos " "nos lugares apropriados na sequência de comandos. Isto é equivalente a " -"especificar o addon a correr coma bandeira --with no ficheiro debian/rules " -"file. Qualquer chamada --without que especifique um addon nesta variável de " -"ambiente não será executada." +"especificar o addon a correr coma bandeira --with no ficheiro " +"debian/rules file. Qualquer chamada --without que especifique um addon " +"nesta variável de ambiente não será executada." #. type: textblock #: debhelper.pod:1147 @@ -2614,70 +2665,52 @@ msgstr "" "ficheiros de regras. Se de todo possível, isto deve ser evitado em favor de " "uma bandeira --with no ficheiro rules." -#. type: =item -#: debhelper.pod:1152 -msgid "" -"B, B, B, B, B, " -"B, B, B, B" -msgstr "" - -#. type: textblock -#: debhelper.pod:1154 -msgid "" -"By default (in any non-deprecated compat level), debhelper will " -"automatically set these flags by using L, when they are " -"unset. If you need to change the default flags, please use the features " -"from L to do this (e.g. " -"B or B) rather than setting the concrete variable directly." -msgstr "" - #. type: =head1 -#: debhelper.pod:1163 debhelper-obsolete-compat.pod:118 dh:1104 +#: debhelper.pod:1154 debhelper-obsolete-compat.pod:118 dh:1104 #: dh_auto_build:53 dh_auto_clean:55 dh_auto_configure:58 dh_auto_install:97 -#: dh_auto_test:64 dh_bugfiles:133 dh_builddeb:182 dh_clean:186 dh_compress:242 +#: dh_auto_test:64 dh_bugfiles:133 dh_builddeb:182 dh_clean:186 dh_compress:236 #: dh_dwz:141 dh_fixperms:164 dh_gconf:105 dh_gencontrol:207 dh_icons:75 #: dh_install:350 dh_installcatalogs:125 dh_installchangelogs:302 -#: dh_installcron:78 dh_installdeb:404 dh_installdebconf:128 dh_installdirs:128 +#: dh_installcron:78 dh_installdeb:270 dh_installdebconf:128 dh_installdirs:128 #: dh_installdocs:444 dh_installemacsen:138 dh_installexamples:175 -#: dh_installifupdown:72 dh_installinfo:107 dh_installinit:429 +#: dh_installifupdown:72 dh_installinfo:107 dh_installinit:425 #: dh_installinitramfs:85 dh_installlogcheck:81 dh_installlogrotate:53 #: dh_installman:362 dh_installmanpages:198 dh_installmenu:88 dh_installmime:63 #: dh_installmodules:109 dh_installpam:62 dh_installppp:68 dh_installudev:102 #: dh_installwm:129 dh_installxfonts:96 dh_link:163 dh_lintian:60 #: dh_listpackages:35 dh_makeshlibs:355 dh_md5sums:117 dh_movefiles:161 -#: dh_perl:166 dh_prep:70 dh_shlibdeps:204 dh_strip:431 dh_testdir:63 +#: dh_perl:159 dh_prep:70 dh_shlibdeps:199 dh_strip:428 dh_testdir:63 #: dh_testroot:91 dh_usrlocal:136 dh_systemd_enable:281 dh_systemd_start:280 msgid "SEE ALSO" msgstr "VEJA TAMBÉM" #. type: =item -#: debhelper.pod:1167 +#: debhelper.pod:1158 msgid "F" msgstr "F" #. type: textblock -#: debhelper.pod:1169 +#: debhelper.pod:1160 msgid "A set of example F files that use debhelper." msgstr "Um conjunto de ficheiros F exemplo que usam debhelper." #. type: =item -#: debhelper.pod:1171 +#: debhelper.pod:1162 msgid "L" msgstr "L" #. type: textblock -#: debhelper.pod:1173 +#: debhelper.pod:1164 msgid "Debhelper web site." msgstr "Sítio web do debhelper." #. type: =head1 -#: debhelper.pod:1177 dh:1110 dh_auto_build:59 dh_auto_clean:61 +#: debhelper.pod:1168 dh:1110 dh_auto_build:59 dh_auto_clean:61 #: dh_auto_configure:64 dh_auto_install:103 dh_auto_test:70 dh_bugfiles:141 -#: dh_builddeb:188 dh_clean:192 dh_compress:248 dh_dwz:147 dh_fixperms:170 +#: dh_builddeb:188 dh_clean:192 dh_compress:242 dh_dwz:147 dh_fixperms:170 #: dh_gconf:111 dh_gencontrol:213 dh_icons:81 dh_install:356 #: dh_installcatalogs:131 dh_installchangelogs:308 dh_installcron:84 -#: dh_installdeb:410 dh_installdebconf:134 dh_installdirs:134 +#: dh_installdeb:276 dh_installdebconf:134 dh_installdirs:134 #: dh_installdocs:450 dh_installemacsen:145 dh_installexamples:181 #: dh_installifupdown:78 dh_installinfo:113 dh_installinitramfs:93 #: dh_installlogcheck:87 dh_installlogrotate:59 dh_installman:368 @@ -2685,24 +2718,24 @@ msgstr "Sítio web do debhelper." #: dh_installmodules:115 dh_installpam:68 dh_installppp:74 dh_installudev:108 #: dh_installwm:135 dh_installxfonts:102 dh_link:169 dh_lintian:68 #: dh_listpackages:41 dh_makeshlibs:361 dh_md5sums:123 dh_movefiles:167 -#: dh_perl:172 dh_prep:76 dh_shlibdeps:210 dh_strip:437 dh_testdir:69 +#: dh_perl:165 dh_prep:76 dh_shlibdeps:205 dh_strip:434 dh_testdir:69 #: dh_testroot:97 dh_usrlocal:142 msgid "AUTHOR" msgstr "AUTOR" #. type: textblock -#: debhelper.pod:1179 dh:1112 dh_auto_build:61 dh_auto_clean:63 +#: debhelper.pod:1170 dh:1112 dh_auto_build:61 dh_auto_clean:63 #: dh_auto_configure:66 dh_auto_install:105 dh_auto_test:72 dh_builddeb:190 -#: dh_clean:194 dh_compress:250 dh_fixperms:172 dh_gencontrol:215 -#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:412 +#: dh_clean:194 dh_compress:244 dh_fixperms:172 dh_gencontrol:215 +#: dh_install:358 dh_installchangelogs:310 dh_installcron:86 dh_installdeb:278 #: dh_installdebconf:136 dh_installdirs:136 dh_installdocs:452 #: dh_installemacsen:147 dh_installexamples:183 dh_installifupdown:80 -#: dh_installinfo:115 dh_installinit:437 dh_installlogrotate:61 +#: dh_installinfo:115 dh_installinit:433 dh_installlogrotate:61 #: dh_installman:370 dh_installmanpages:206 dh_installmenu:98 dh_installmime:71 #: dh_installmodules:117 dh_installpam:70 dh_installppp:76 dh_installudev:110 #: dh_installwm:137 dh_installxfonts:104 dh_link:171 dh_listpackages:43 #: dh_makeshlibs:363 dh_md5sums:125 dh_movefiles:169 dh_prep:78 -#: dh_shlibdeps:212 dh_strip:439 dh_testdir:71 dh_testroot:99 +#: dh_shlibdeps:207 dh_strip:436 dh_testdir:71 dh_testroot:99 msgid "Joey Hess " msgstr "Joey Hess " @@ -2895,22 +2928,22 @@ msgstr "" #. type: textblock #: debhelper-obsolete-compat.pod:120 dh:1106 dh_auto_build:55 dh_auto_clean:57 #: dh_auto_configure:60 dh_auto_install:99 dh_auto_test:66 dh_builddeb:184 -#: dh_clean:188 dh_compress:244 dh_dwz:143 dh_fixperms:166 dh_gconf:107 +#: dh_clean:188 dh_compress:238 dh_dwz:143 dh_fixperms:166 dh_gconf:107 #: dh_gencontrol:209 dh_install:352 dh_installcatalogs:127 -#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:406 +#: dh_installchangelogs:304 dh_installcron:80 dh_installdeb:272 #: dh_installdebconf:130 dh_installdirs:130 dh_installdocs:446 #: dh_installexamples:177 dh_installifupdown:74 dh_installinfo:109 #: dh_installlogcheck:83 dh_installlogrotate:55 dh_installman:364 #: dh_installmanpages:200 dh_installmime:65 dh_installmodules:111 #: dh_installpam:64 dh_installppp:70 dh_installudev:104 dh_installwm:131 #: dh_installxfonts:98 dh_link:165 dh_listpackages:37 dh_makeshlibs:357 -#: dh_md5sums:119 dh_movefiles:163 dh_perl:168 dh_prep:72 dh_strip:433 +#: dh_md5sums:119 dh_movefiles:163 dh_perl:161 dh_prep:72 dh_strip:430 #: dh_testdir:65 dh_testroot:93 dh_usrlocal:138 dh_systemd_start:282 msgid "L" msgstr "L" #. type: =head1 -#: debhelper-obsolete-compat.pod:122 dh_installinit:435 dh_systemd_enable:285 +#: debhelper-obsolete-compat.pod:122 dh_installinit:431 dh_systemd_enable:285 #: dh_systemd_start:284 msgid "AUTHORS" msgstr "AUTORES" @@ -3002,15 +3035,15 @@ msgstr "" #: dh_auto_install:46 dh_auto_test:34 dh_bugfiles:53 dh_builddeb:34 dh_clean:47 #: dh_compress:52 dh_dwz:26 dh_fixperms:40 dh_gconf:42 dh_gencontrol:38 #: dh_icons:33 dh_install:66 dh_installcatalogs:53 dh_installchangelogs:73 -#: dh_installcron:43 dh_installdeb:98 dh_installdebconf:64 dh_installdirs:42 -#: dh_installdocs:90 dh_installemacsen:56 dh_installexamples:41 -#: dh_installifupdown:42 dh_installinfo:38 dh_installinit:78 -#: dh_installinitramfs:43 dh_installlogcheck:45 dh_installlogrotate:25 -#: dh_installman:83 dh_installmanpages:43 dh_installmenu:44 -#: dh_installmodules:41 dh_installpam:34 dh_installppp:38 dh_installudev:34 -#: dh_installwm:38 dh_link:66 dh_makeshlibs:52 dh_md5sums:31 dh_movefiles:41 -#: dh_perl:34 dh_prep:29 dh_shlibdeps:30 dh_strip:38 dh_testdir:26 -#: dh_usrlocal:50 dh_systemd_enable:83 dh_systemd_start:33 +#: dh_installcron:43 dh_installdebconf:64 dh_installdirs:42 dh_installdocs:90 +#: dh_installemacsen:56 dh_installexamples:41 dh_installifupdown:42 +#: dh_installinfo:38 dh_installinit:78 dh_installinitramfs:43 +#: dh_installlogcheck:45 dh_installlogrotate:25 dh_installman:83 +#: dh_installmanpages:43 dh_installmenu:44 dh_installmodules:41 +#: dh_installpam:34 dh_installppp:38 dh_installudev:34 dh_installwm:38 +#: dh_link:66 dh_makeshlibs:52 dh_md5sums:31 dh_movefiles:41 dh_perl:34 +#: dh_prep:29 dh_shlibdeps:30 dh_strip:38 dh_testdir:26 dh_usrlocal:50 +#: dh_systemd_enable:83 dh_systemd_start:33 msgid "OPTIONS" msgstr "OPÇÕES" @@ -3177,6 +3210,10 @@ msgstr "" #. type: verbatim #: dh:119 #, no-wrap +#| msgid "" +#| "\toverride_dh_strip:\n" +#| "\t\tdh_strip -Xfoo\n" +#| "\t\n" msgid "" "\toverride_dh_strip:\n" "\t\tdh_strip -Xfoo\n" @@ -3677,17 +3714,17 @@ msgstr "" #. type: textblock #: dh:1108 dh_auto_build:57 dh_auto_clean:59 dh_auto_configure:62 #: dh_auto_install:101 dh_auto_test:68 dh_bugfiles:139 dh_builddeb:186 -#: dh_clean:190 dh_compress:246 dh_dwz:145 dh_fixperms:168 dh_gconf:109 +#: dh_clean:190 dh_compress:240 dh_dwz:145 dh_fixperms:168 dh_gconf:109 #: dh_gencontrol:211 dh_icons:79 dh_install:354 dh_installchangelogs:306 -#: dh_installcron:82 dh_installdeb:408 dh_installdebconf:132 dh_installdirs:132 +#: dh_installcron:82 dh_installdeb:274 dh_installdebconf:132 dh_installdirs:132 #: dh_installdocs:448 dh_installemacsen:143 dh_installexamples:179 -#: dh_installifupdown:76 dh_installinfo:111 dh_installinit:433 +#: dh_installifupdown:76 dh_installinfo:111 dh_installinit:429 #: dh_installinitramfs:91 dh_installlogrotate:57 dh_installman:366 #: dh_installmanpages:202 dh_installmenu:94 dh_installmime:67 #: dh_installmodules:113 dh_installpam:66 dh_installppp:72 dh_installudev:106 #: dh_installwm:133 dh_installxfonts:100 dh_link:167 dh_lintian:64 #: dh_listpackages:39 dh_makeshlibs:359 dh_md5sums:121 dh_movefiles:165 -#: dh_perl:170 dh_prep:74 dh_shlibdeps:208 dh_strip:435 dh_testdir:67 +#: dh_perl:163 dh_prep:74 dh_shlibdeps:203 dh_strip:432 dh_testdir:67 #: dh_testroot:95 dh_usrlocal:140 msgid "This program is a part of debhelper." msgstr "Este programa é parte do debhelper." @@ -4264,7 +4301,8 @@ msgstr "" #: dh_clean:21 #, no-wrap msgid "" -"B is a debhelper program that is responsible for cleaning up after a\n" +"B is a debhelper program that is responsible for cleaning up after" +" a\n" "package is built. It removes the package build directories, and removes some\n" "other files including F, and any detritus left behind by other\n" "debhelper commands. It also removes common files that should not appear in a\n" @@ -4508,6 +4546,9 @@ msgstr "" #. type: textblock #: dh_dwz:18 +#| msgid "" +#| "B [S>] [B<-n>] [S " +#| "I>]" msgid "B [S>] [B<-X>I] [S I>]" msgstr "" "B [S>] [B<-X>I] [S I>]" @@ -4578,11 +4619,16 @@ msgid "" "useful for setting memory related parameters (e.g. -l and -L)." msgstr "" "Passa I para L quando processa binários ELF. Isto é " -"maioritariamente útil para definir parâmetros relacionados com memória (ex. -" -"l e -L)." +"maioritariamente útil para definir parâmetros relacionados com memória " +"(ex. -l e -L)." #. type: textblock #: dh_dwz:59 +#| msgid "" +#| "If the B environment variable contains B, " +#| "nothing will be stripped, in accordance with Debian policy (section 10.1 " +#| "\"Binaries\"). This will also inhibit the automatic creation of debug " +#| "symbol packages." msgid "" "If the B environment variable contains B, " "nothing will be stripped, in accordance with Debian policy (section 10.1 " @@ -4600,10 +4646,10 @@ msgid "" "build times (e.g. for \"build and test\"-cycles) rather than optimizing for " "size." msgstr "" -"Embora esta ferramenta tecnicamente não remover informação de depuração dos " -"binários, é na mesma incluída quando a variável de ambiente " -"B contém B. Isto é assim porque B é " -"muito usado para optimizar tempos de compilação (ex. para -cycles de " +"Embora esta ferramenta tecnicamente não remover informação de depuração " +"dos binários, é na mesma incluída quando a variável de ambiente " +"B contém B. Isto é assim porque B " +"é muito usado para optimizar tempos de compilação (ex. para -cycles de " "\"compilar e testar\") em vez de optimizar para tamanho." #. type: textblock @@ -4681,6 +4727,7 @@ msgstr "" #. type: textblock #: dh_gconf:5 +#| msgid "dh_gconf - install GConf defaults files and register schemas" msgid "" "dh_gconf - install GConf defaults files and register schemas (deprecated)" msgstr "" @@ -4948,6 +4995,11 @@ msgstr "" #. type: textblock #: dh_install:36 +#| msgid "" +#| "From debhelper compatibility level 7 on, B will fall back to " +#| "looking in F for files, if it doesn't find them in the " +#| "current directory (or wherever you've told it to look using B<--" +#| "sourcedir>)." msgid "" "From debhelper compatibility level 7 on, B will fall back to " "looking in F for files, if it does not find them in the current " @@ -5041,8 +5093,9 @@ msgid "" msgstr "" "B: Por favor use B em vez deste. " "Se usar esta opção, B irá chamar B com essa opção " -"após ter processado todos os ficheiros. Por favor veja L para " -"a documentação sobre esta opção." +"após ter processado todos os ficheiros. Por favor veja L para" +" a " +"documentação sobre esta opção." #. type: =item #: dh_install:88 dh_installdirs:59 dh_installdocs:104 dh_installexamples:50 @@ -5314,6 +5367,10 @@ msgstr "" #. type: textblock #: dh_installchangelogs:24 +#| msgid "" +#| "An upstream F file may be specified as an option. If none is " +#| "specified, it looks for files with names that seem likely to be " +#| "changelogs. (In compatibility level 7 and above.)" msgid "" "An upstream F file may be specified as an option. If none is " "specified, B may look for files with names that seem " @@ -5321,10 +5378,10 @@ msgid "" "package is using compatibility level 7 or above)." msgstr "" "Pode ser especificado como uma opção um ficheiro F do autor " -"original (upstream) Se nenhum for especificado, B pode " -"procurar por ficheiros cujos nomes apontam provavelmente para relatórios de " -"alterações como descrito no próximo parágrafo (assumindo que o pacote usa " -"nível de compatibilidade 7 ou superior.)" +"original (upstream) Se nenhum for especificado, B " +"pode procurar por ficheiros cujos nomes apontam provavelmente para relatórios " +"de alterações como descrito no próximo parágrafo (assumindo que o pacote " +"usa nível de compatibilidade 7 ou superior.)" #. type: textblock #: dh_installchangelogs:29 @@ -5339,14 +5396,14 @@ msgid "" "source directory (e.g. the root or the F subdirectory)." msgstr "" "Em pacotes não-nativos, o B irá primeiro procurar por " -"ficheiros changelog instalados pelo sistema de compilação do autor em F<< " -"usr/share/doc/I >> (do directório de compilação do pacote) e " +"ficheiros changelog instalados pelo sistema de compilação do autor em " +"F<< usr/share/doc/I >> (do directório de compilação do pacote) e " "renomear o melhor candidato (se existir algum) para F<< usr/share/doc/" "I/changelog >>. Note que B I procura " "nenhum directório fonte (tal como F). Caso contrário, " "B (no nível de compatibilidade 7 ou posterior) irá " -"procurar por ficheiros changelog no directório fonte (ex. a raiz do sub-" -"directório F)." +"procurar por ficheiros changelog no directório fonte (ex. a raiz do " +"sub-directório F)." #. type: textblock #: dh_installchangelogs:39 @@ -5359,6 +5416,13 @@ msgstr "" #. type: textblock #: dh_installchangelogs:42 +#| msgid "" +#| "If the upstream changelog is an F file (determined by file " +#| "extension), it will be installed as F instead. If the html changelog is converted to plain text, that " +#| "variant can be specified as a second upstream changelog file. When no " +#| "plain text variant is specified, a short F is generated, pointing readers at the html changelog file." msgid "" "If the specified upstream changelog is an F file (determined by file " "extension), it will be installed as F " @@ -5586,43 +5650,29 @@ msgstr "Estes scripts de mantenedor são instalados no directório F." #. type: textblock #: dh_installdeb:39 msgid "" -"B will perform substitution of known tokens of the pattern " -"B<#TOKEN#>. In generally, scripts will want to include the B<#DEBHELPER#> " -"to benefit from the shell scripts generated by debhelper commands (including " -"those from B when it processes I.maintscript files)" -msgstr "" - -#. type: textblock -#: dh_installdeb:45 -#, fuzzy -#| msgid "" -#| "Inside the scripts, the token B<#DEBHELPER#> is replaced with shell " -#| "script snippets generated by other debhelper commands." -msgid "" -"For more information on what tokens Inside the scripts, the token " -"B<#DEBHELPER#> is replaced with shell script snippets generated by other " -"debhelper commands." +"Inside the scripts, the token B<#DEBHELPER#> is replaced with shell script " +"snippets generated by other debhelper commands." msgstr "" "Dentro dos scripts, o sinal B<#DEBHELPER#> é substituído por fragmentos de " "script shell gerados por outros comandos do debhelper." #. type: =item -#: dh_installdeb:49 +#: dh_installdeb:42 msgid "I.triggers" msgstr "I.triggers" #. type: =item -#: dh_installdeb:51 +#: dh_installdeb:44 msgid "I.shlibs" msgstr "I.shlibs" #. type: textblock -#: dh_installdeb:53 +#: dh_installdeb:46 msgid "These control files are installed into the F directory." msgstr "Estes ficheiros de controle são instalados no directório F." #. type: textblock -#: dh_installdeb:55 +#: dh_installdeb:48 msgid "" "Note that I.shlibs is only installed in compat level 9 and " "earlier. In compat 10, please use L." @@ -5631,12 +5681,12 @@ msgstr "" "e anteriores. Em compatibilidade 10, use L." #. type: =item -#: dh_installdeb:58 +#: dh_installdeb:51 msgid "I.conffiles" msgstr "I.conffiles" #. type: textblock -#: dh_installdeb:60 +#: dh_installdeb:53 msgid "" "Historically, this file was needed to manually mark files files as " "conffiles. However, it has become de facto obsolete since debhelper " @@ -5644,11 +5694,11 @@ msgid "" msgstr "" "Historicamente, este ficheiro era preciso para marcar manualmente ficheiros " "como ficheiros de configuração (conffiles). No entanto, tem-se tornado de " -"facto obsoleto desde que o debhelper passou a computar automaticamente quais " -"os ficheiros devem ser marcados como ficheiros de configuração." +"facto obsoleto desde que o debhelper passou a computar automaticamente " +"quais os ficheiros devem ser marcados como ficheiros de configuração." #. type: textblock -#: dh_installdeb:64 +#: dh_installdeb:57 msgid "" "In compatibility level up and including 11, this control file will be " "installed into the F directory. In compatibility level 12 and " @@ -5659,12 +5709,12 @@ msgstr "" "posterior, o ficheiro é ignorado em silêncio." #. type: =item -#: dh_installdeb:68 +#: dh_installdeb:61 msgid "I.maintscript" msgstr "I.maintscript" #. type: textblock -#: dh_installdeb:70 +#: dh_installdeb:63 msgid "" "Lines in this file correspond to L commands and " "parameters. However, the \"maint-script-parameters\" should I be " @@ -5675,12 +5725,12 @@ msgstr "" "devem ser incluídos pois o debhelper irá adicionar esses automaticamente." #. type: textblock -#: dh_installdeb:74 +#: dh_installdeb:67 msgid "Example:" msgstr "Exemplo:" #. type: verbatim -#: dh_installdeb:76 +#: dh_installdeb:69 #, no-wrap msgid "" " # Correct\n" @@ -5696,7 +5746,7 @@ msgstr "" "\n" #. type: textblock -#: dh_installdeb:81 +#: dh_installdeb:74 msgid "" "In compat 10 or later, any shell metacharacters will be escaped, so " "arbitrary shell code cannot be inserted here. For example, a line such as " @@ -5710,7 +5760,7 @@ msgstr "" "scripts de mantenedor suficientes para mover esse ficheiro de configuração." #. type: textblock -#: dh_installdeb:87 +#: dh_installdeb:80 msgid "" "It was also the intention to escape shell metacharacters in previous compat " "levels. However, it did not work properly and as such it was possible to " @@ -5722,7 +5772,7 @@ msgstr "" "compatibilidade anteriores." #. type: textblock -#: dh_installdeb:91 +#: dh_installdeb:84 msgid "" "The B tool will do some basic validation of some of the " "commands listed in this file to catch common mistakes. The validation is " @@ -5733,206 +5783,6 @@ msgstr "" "activada como um aviso desde compatibilidade 10 e como um erro a resolver na " "compatibilidade 12." -#. type: =item -#: dh_installdeb:102 -msgid "B<-D>I, B<--define> I" -msgstr "" - -#. type: textblock -#: dh_installdeb:104 -msgid "" -"Define tokens to be replaced inside the maintainer scripts when it is " -"generated. Please note that the limitations described in L also applies to tokens defined on the command line." -msgstr "" - -#. type: textblock -#: dh_installdeb:109 -msgid "" -"In the simple case, this parameter will cause B<< #I# >> to be " -"replaced by I. If I starts with a literal I<@>-sign, then " -"I is expected to point to a file containing the actual value to " -"insert." -msgstr "" - -#. type: textblock -#: dh_installdeb:114 -msgid "" -"An explicit declared token with this parameter will replace built-in tokens." -msgstr "" - -#. type: textblock -#: dh_installdeb:117 -msgid "Test examples to aid with the understanding:" -msgstr "" - -#. type: verbatim -#: dh_installdeb:119 -#, no-wrap -msgid "" -"\tcat >> debian/postinst < some-file\n" -" dh_installdeb --define SIMPLE=direct --define FILEBASED=@some-file\n" -"\n" -msgstr "" - -#. type: textblock -#: dh_installdeb:126 -msgid "" -"In this example, B<#SIMPLE#> will expand to B and B<#FILEBASED#> " -"will expand to B." -msgstr "" - -#. type: textblock -#: dh_installdeb:129 -msgid "" -"It is also possible to do set package-specific values for a given token. " -"This is useful when B is acting on multiple packages that " -"need different values for the same token. This is done by prefixing the " -"token name with B<< pkg.I. >>." -msgstr "" - -#. type: textblock -#: dh_installdeb:134 -msgid "This can be used as in the following example:" -msgstr "" - -#. type: verbatim -#: dh_installdeb:136 -#, no-wrap -msgid "" -"\tcat >> debian/foo.postinst <> debian/bar.postinst <> debian/baz.postinst < will expand to B in F, to B in F and to B in F." -msgstr "" - -#. type: textblock -#: dh_installdeb:155 -msgid "" -"Note that the B<#pkg.*#> tokens will be visible in all scripts acted on. E." -"g. you can refer to B<#pkg.bar.TOKEN#> inside F and it " -"will be replaced by B." -msgstr "" - -#. type: =head1 -#: dh_installdeb:161 -msgid "SUBSTITUTION IN MAINTAINER SCRIPTS" -msgstr "" - -#. type: textblock -#: dh_installdeb:163 -msgid "" -"The B will automatically replace the following tokens inside " -"a provided maintainer script (if not replaced via B<-D>/B<--define>):" -msgstr "" - -#. type: =item -#: dh_installdeb:168 -#, fuzzy -#| msgid "DEBHELPER COMMANDS" -msgid "#DEBHELPER#" -msgstr "COMANDOS DO DEBHELPER" - -#. type: textblock -#: dh_installdeb:170 -msgid "" -"This token is by default replaced with generated shell snippets debhelper " -"commands. This includes the snippets generated by B from " -"I.maintscript file (if present)." -msgstr "" - -#. type: =item -#: dh_installdeb:174 -msgid "#DEB_HOST_I#, #DEB_BUILD_I#, #DEB_TARGET_I#" -msgstr "" - -#. type: textblock -#: dh_installdeb:176 -msgid "" -"These tokens are replaced with the respective variable from L. In almost all cases, you will want use the B<< " -"#DEB_HOST_I >> variant in a script to ensure you get the right value " -"when cross-building." -msgstr "" - -#. type: textblock -#: dh_installdeb:181 -msgid "" -"On a best effort, tokens of this pattern that do not match a variable in " -"L will be left as-is." -msgstr "" - -#. type: =item -#: dh_installdeb:184 -msgid "#ENV.I#" -msgstr "" - -#. type: textblock -#: dh_installdeb:186 -msgid "" -"These tokens of this form will be replaced with value of the corresponding " -"environment variable. If the environment variable is unset, the token is " -"replaced with the empty string." -msgstr "" - -#. type: textblock -#: dh_installdeb:191 -msgid "" -"Note that there are limits on which names can be used (see L)." -msgstr "" - -#. type: =item -#: dh_installdeb:194 -msgid "#PACKAGE#" -msgstr "" - -#. type: textblock -#: dh_installdeb:196 -msgid "" -"This token is by default replaced the package name, which will contain the " -"concrete script." -msgstr "" - -#. type: =head2 -#: dh_installdeb:201 -msgid "Limitations in token names" -msgstr "" - -#. type: textblock -#: dh_installdeb:203 -msgid "" -"All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.]+#" -msgstr "" - -#. type: textblock -#: dh_installdeb:205 -msgid "Tokens that do not match that regex will be silently ignored." -msgstr "" - #. type: textblock #: dh_installdebconf:5 msgid "" @@ -6072,6 +5922,9 @@ msgstr "" #. type: textblock #: dh_installdirs:17 +#| msgid "" +#| "B [S>] [B<--sourcedir=>I] [B<-" +#| "X>I] [S ...>]" msgid "" "B [S>] [B<-A>] [B<--sourcedir=>I] " "[B<--create-in-sourcedir>] [S ...>]" @@ -6146,6 +5999,7 @@ msgstr "" #. type: textblock #: dh_installdirs:57 +#| msgid "The default is to create debug symbol packages." msgid "The default is B<--no-create-in-sourcedir>." msgstr "A predefinição é B<--no-create-in-sourcedir>." @@ -6226,17 +6080,27 @@ msgstr "" #. type: textblock #: dh_installdocs:31 dh_installexamples:27 dh_installinfo:24 dh_installman:69 +#| msgid "" +#| "From debhelper compatibility level 7 on, B will fall back to " +#| "looking in F for files, if it doesn't find them in the " +#| "current directory (or wherever you've told it to look using B<--" +#| "sourcedir>)." msgid "" "From debhelper compatibility level 11 on, B will fall back to " "looking in F for files, if it does not find them in the current " "directory (or wherever you've told it to look using B<--sourcedir>)." msgstr "" -"Desde nível de compatibilidade 11 do debhelper em diante, o B " -"irá procurar os ficheiros em F, se não os encontrar no " -"directório actual (ou onde você o mandou procurar usando B<--sourcedir>)." +"Desde nível de compatibilidade 11 do debhelper em diante, o B irá " +"procurar os ficheiros em F, se não os encontrar no directório " +"actual (ou onde você o mandou procurar usando B<--sourcedir>)." #. type: textblock #: dh_installdocs:35 +#| msgid "" +#| "In compat 11 and later, B offers many of the features " +#| "that L also have. Furthermore, B also " +#| "supports the B build profile to exclude documentation (regardless " +#| "of compat level)." msgid "" "In compat 11 and later, B offers many of the features that " "L also has. Furthermore, B also supports the " @@ -6540,6 +6404,12 @@ msgstr "" #. type: textblock #: dh_installdocs:168 +#| msgid "" +#| "B: The use of B<--link-doc> should only be done when the " +#| "packages have same \"architecture\" type. A link from a architecture " +#| "independent package to a architecture dependent package (or vice versa) " +#| "will not work. Since compat 10, debhelper will actively reject " +#| "unsupported combinations." msgid "" "B: The use of B<--link-doc> should only be done when the packages " "have same \"architecture\" type. A link from an architecture independent " @@ -6964,6 +6834,11 @@ msgstr "" #. type: textblock #: dh_installinit:22 +#| msgid "" +#| "B is a debhelper program that is responsible for " +#| "installing init scripts with associated defaults files. In compatibility " +#| "levels up to 11, B also handled upstart job files and " +#| "systemd service files." msgid "" "B is a debhelper program that is responsible for installing " "init scripts with associated defaults files. In compatibility levels up to " @@ -6979,8 +6854,8 @@ msgstr "" "alguns ficheiros relacionados com o systemd fornecidos pelo empacotamento " "debian (veja a secção L em baixo). Em níveis de compatibilidade " "até, e incluindo, 11, B irá também lidar com trabalhos de " -"arranque fornecidos pelo empacotamento debian (veja L para mais " -"informação sobre isto também)." +"arranque fornecidos pelo empacotamento debian (veja L para " +"mais informação sobre isto também)." #. type: textblock #: dh_installinit:31 @@ -7267,12 +7142,16 @@ msgid "" "EscriptE defaults-disabled >>." msgstr "" "Desactiva o script de init na purga, mas não o activa na instalação. Isto " -"implica uma dependência baseada na versão em B<< init-system-helpers (E= " -"1.51) >> pois é a primeira versão funcional que suporta B<< update-rc.d " -"EscriptE defaults-disabled >>." +"implica uma dependência baseada na versão em B<< init-system-helpers " +"(E= 1.51) >> pois é a primeira versão funcional que suporta " +"B<< update-rc.d EscriptE defaults-disabled >>." #. type: textblock #: dh_installinit:149 +#| msgid "" +#| "B that this option does not affect whether the services are " +#| "started. That is controlled by L (using e.g. its " +#| "B<--no-start> option)." msgid "" "B that this option does not affect whether the services are started. " "Please remember to also use B<--no-start> if the service should not be " @@ -7283,6 +7162,7 @@ msgstr "" #. type: textblock #: dh_installinit:153 +#| msgid "B<-u>I B<--update-rcd-params=>I" msgid "" "Cannot be combined with B<-u>I, B<--update-rcd-params=>I, or " "B<--> I." @@ -7320,14 +7200,17 @@ msgstr "B<-u>I B<--update-rcd-params=>I" #. type: textblock #: dh_installinit:169 +#| msgid "" +#| "Pass I to L. If not specified, B will " +#| "be passed to L." msgid "" "Pass I to L. If not specified, B (or " "B with B<--no-enable>) will be passed to L." msgstr "" -"Passa I para L. Se não especificado, B " -"(ou B com B<--no-enable>) será passado para L." +"Passa I para L. Se não especificado, B" +" (ou " +"B com B<--no-enable>) será passado para L." #. type: textblock #: dh_installinit:173 @@ -7400,22 +7283,25 @@ msgstr "" "F, antes do símbolo B<#DEBHELPER#>." #. type: textblock -#: dh_installinit:431 +#: dh_installinit:427 +#| msgid "L, L" msgid "L, L" msgstr "L, L" #. type: textblock -#: dh_installinit:439 +#: dh_installinit:435 msgid "Steve Langasek " msgstr "Steve Langasek " #. type: textblock -#: dh_installinit:441 +#: dh_installinit:437 msgid "Michael Stapelberg " msgstr "Michael Stapelberg " #. type: textblock #: dh_installinitramfs:5 +#| msgid "" +#| "dh_installinit - install service init files into package build directories" msgid "dh_installinitramfs - install initramfs hooks and setup maintscripts" msgstr "" "dh_installinitramfs - instala hooks de initramfs e scripts principais de " @@ -7423,20 +7309,28 @@ msgstr "" #. type: textblock #: dh_installinitramfs:17 +#| msgid "B [S>] [B<-n>]" msgid "B [S>] [B<-n>]" msgstr "B [S>] [B<-n>]" #. type: textblock #: dh_installinitramfs:21 +#| msgid "" +#| "B is a debhelper program that is responsible for " +#| "installing mime files into package build directories." msgid "" "B is a debhelper program that is responsible for " "installing Debian package provided initramfs hooks." msgstr "" -"B é um programa debhelper que é responsável por " -"instalar um pacote Debian que fornece hooks de initramfs" +"B é um programa debhelper que é responsável por instalar " +"um pacote Debian que fornece hooks de initramfs" #. type: textblock #: dh_installinitramfs:24 +#| msgid "" +#| "It also automatically generates the F and F commands " +#| "needed to interface with the Debian B package. These commands are " +#| "inserted into the maintainer scripts by L." msgid "" "If B installs or (in compat 12 or later) detects one or " "more initramfs hooks in the package, then it also automatically generates " @@ -7446,12 +7340,13 @@ msgid "" msgstr "" "Se o B instalar ou (em compatibilidade 12 ou posterior) " "detectar um ou mais hooks de initramfs no pacote, então também gera " -"automaticamente os comandos F e F necessários para " -"interagir com o sistema initramfs de Debian B. Estes comandos são " -"inseridos nos scripts do mantenedor pelo L." +"automaticamente os comandos F e F necessários " +"para interagir com o sistema initramfs de Debian B. Estes comandos " +"são inseridos nos scripts do mantenedor pelo L." #. type: =item #: dh_installinitramfs:34 +#| msgid "debian/I.init" msgid "debian/I.initramfs-hook" msgstr "debian/I.initramfs-hook" @@ -7465,8 +7360,8 @@ msgid "" msgstr "" "Assumido ser um hook de initramfs que será instalado em F<< usr/share/" "initramfs-tools/hooks/I >> no directório de compilação do pacote. " -"Veja B em L para mais informação acerca de " -"hooks de initramfs." +"Veja B em L para mais informação acerca " +"de hooks de initramfs." #. type: textblock #: dh_installinitramfs:49 dh_installmenu:50 @@ -7475,6 +7370,7 @@ msgstr "Não modifique os scripts F/F." #. type: textblock #: dh_installinitramfs:87 +#| msgid "L L L" msgid "L L L" msgstr "L L L" @@ -7620,20 +7516,12 @@ msgstr "" #. type: textblock #: dh_installman:25 -#, fuzzy -#| msgid "" -#| "In compat 10 and earlier, this program was primarily for when upstream's " -#| "build system does not properly install them as a part of its install step " -#| "(or it does not have an install step). In compat 11 and later, it " -#| "supports the same features of L and has the advantage that " -#| "it respects the B build profile (unlike L)." msgid "" "In compat 10 and earlier, this program was primarily for when upstream's " "build system does not properly install them as a part of its install step " -"(or it does not have an install step). In compat 11 and later, it also " -"supports the default searchdir plus --sourcedir like dh_install(1) and has " -"the advantage that it respects the nodoc build profile (unlike " -"dh_install(1))." +"(or it does not have an install step). In compat 11 and later, it supports " +"the same features of L and has the advantage that it respects " +"the B build profile (unlike L)." msgstr "" "Em compatibilidade 10 e anteriores, este programa servia principalmente para " "quando o sistema de compilação do autor não os instalava apropriadamente " @@ -8324,6 +8212,9 @@ msgstr "" #. type: textblock #: dh_installwm:54 +#| msgid "" +#| "Create any links specified by command line parameters in ALL packages " +#| "acted on, not just the first." msgid "" "Modify scripts for window managers specified by command line parameters in " "ALL packages acted on, not just the first." @@ -8519,6 +8410,11 @@ msgstr "" #. type: textblock #: dh_link:56 +#| msgid "" +#| "In each pair the source file (called B by L) comes first " +#| "and is followed by the destination file (called B by " +#| "L). Thus the pairs of source and destination files in each line " +#| "are give in the same order as they would be given to L." msgid "" "In each pair the source file (called B by L) comes first and " "is followed by the destination file (called B by L). Thus " @@ -8717,6 +8613,9 @@ msgstr "" #. type: textblock #: dh_listpackages:26 +#| msgid "" +#| "These files are installed into the first binary package listed in debian/" +#| "control." msgid "Packages are listed in the order they appear in F." msgstr "Pacotes são listados na ordem que aparecem em F." @@ -8842,8 +8741,8 @@ msgid "" "If a shlibs file is generated by this program, this option controls what " "version will be used in the dependency relation." msgstr "" -"Se um ficheiro shlibs for gerado por este programa, esta opção controla que " -"versão será usada na relação de dependência." +"Se um ficheiro shlibs for gerado por este programa, esta opção controla " +"que versão será usada na relação de dependência." #. type: textblock #: dh_makeshlibs:70 @@ -8851,8 +8750,8 @@ msgid "" "In compat 12 and later, B defaults to B<-VUpstream-Version>. " "In compat 11 and earlier the default behaved like B<-VNone>.." msgstr "" -"Em compatibilidade 12 e posterior, B usa por predefinição B<-" -"VUpstream-Version>. Em compatibilidade 11 e anterior o comportamento " +"Em compatibilidade 12 e posterior, B usa por predefinição " +"B<-VUpstream-Version>. Em compatibilidade 11 e anterior o comportamento " "predefinido é como B<-VNone>.." #. type: textblock @@ -8874,20 +8773,28 @@ msgid "" "as shown here." msgstr "" "A dependência será \"I B<(E>= IB<)>\". " -"Note que I é sensível a maiúsculas/minúsculas e tem de ser " -"escrito exactamente como mostrado aqui." +"Note que I é sensível a maiúsculas/minúsculas e tem de " +"ser escrito exactamente como mostrado aqui." #. type: textblock #: dh_makeshlibs:83 +#| msgid "" +#| "Beware of using B<-V> without any parameters; this is a conservative " +#| "setting that always ensures that other packages' shared library " +#| "dependencies are at least as tight as they need to be (unless your " +#| "library is prone to changing ABI without updating the upstream version " +#| "number), so that if the maintainer screws up then they won't break. The " +#| "flip side is that packages might end up with dependencies that are too " +#| "tight and so find it harder to be upgraded." msgid "" "This is a conservative setting that always ensures that other packages' " "shared library dependencies are at least as tight as they need to be (unless " "the library is prone to changing ABI without updating the upstream version " "number)." msgstr "" -"Esta é uma definição conservativa que assegura sempre que as dependências de " -"bibliotecas partilhadas dos pacotes mais antigos são pelo menos tão justas o " -"quanto precisam de ser (a menos que a biblioteca seja inclinada a alterar a " +"Esta é uma definição conservativa que assegura sempre que as dependências " +"de bibliotecas partilhadas dos pacotes mais antigos são pelo menos tão justas " +"o quanto precisam de ser (a menos que a biblioteca seja inclinada a alterar a " "ABI sem actualizar o número de versão do autor)." #. type: textblock @@ -8917,6 +8824,7 @@ msgstr "" #. type: =item #: dh_makeshlibs:98 +#| msgid "B<-V>" msgid "B<-VNone>" msgstr "B<-VNone>" @@ -8958,6 +8866,7 @@ msgstr "" #. type: =item #: dh_makeshlibs:113 +#| msgid "B<--ddeb-migration=>I" msgid "B<-V>I" msgstr "B<-V>I" @@ -8994,9 +8903,9 @@ msgid "" "information on this topic." msgstr "" "Quando escolher um valor para esta opção, por favor lembre-se que se o " -"pacote fornecer um ficheiro symbols, então esse é geralmente preferido sobre " -"o ficheiro shlibs para pacotes .deb regulares. Veja L " -"para mais informação sobre este tópico." +"pacote fornecer um ficheiro symbols, então esse é geralmente preferido " +"sobre o ficheiro shlibs para pacotes .deb regulares. Veja " +"L para mais informação sobre este tópico." #. type: textblock #: dh_makeshlibs:134 @@ -9043,6 +8952,7 @@ msgstr "Passa I para L." #. type: =item #: dh_makeshlibs:159 +#| msgid "B" msgid "B" msgstr "B" @@ -9062,6 +8972,7 @@ msgstr "" #. type: =item #: dh_makeshlibs:165 +#| msgid "B" msgid "B" msgstr "B" @@ -9399,7 +9310,7 @@ msgid "Perl policy, version 1.20" msgstr "Perl policy, versão 1.20" #. type: textblock -#: dh_perl:174 +#: dh_perl:167 msgid "Brendan O'Dea " msgstr "Brendan O'Dea " @@ -9642,7 +9553,7 @@ msgstr "" "\t\n" #. type: textblock -#: dh_shlibdeps:206 +#: dh_shlibdeps:201 msgid "L, L" msgstr "L, L" @@ -9832,10 +9743,12 @@ msgstr "" #: dh_strip:100 #, no-wrap msgid "" -" dh_strip --dbgsym-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<< 2.1-3~)'\n" +" dh_strip --dbgsym-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<<" +" 2.1-3~)'\n" "\n" msgstr "" -" dh_strip --dbgsym-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<< 2.1-3~)'\n" +" dh_strip --dbgsym-migration='libfoo-tools-dbg (<< 2.1-3~), libfoo2-dbg (<<" +" 2.1-3~)'\n" "\n" #. type: =item @@ -9988,8 +9901,8 @@ msgid "" "B (and the rest of debhelper) fall back to assuming that " "(fake)root is implied." msgstr "" -"Se o construtor não suportar I, então não irá regular a " -"variável de ambiente I. Isto irá fazer com que " +"Se o construtor não suportar I, então não irá regular " +"a variável de ambiente I. Isto irá fazer com que " "B (e o resto do debhelper) recorra a assumir que é implicado " "(fake)root." @@ -10006,6 +9919,8 @@ msgstr "" #. type: textblock #: dh_testroot:38 +#| msgid "" +#| "B asserts that it is run as root or under L." msgid "" "If unset, or set to C, then B asserts that it " "is run as root or under L." @@ -10024,6 +9939,10 @@ msgstr "" #. type: textblock #: dh_testroot:48 +#| msgid "" +#| "B asserts that it is either run as root (or under " +#| "L) or the builder has provided the B " +#| "environment variable (e.g. via dpkg-buildpackage -r)." msgid "" "If set to any other value than the above, then B asserts that " "it is either run as root (or under L) or the builder has " @@ -10032,8 +9951,8 @@ msgid "" msgstr "" "Se definido para qualquer outro valor que o de cima, então B " "declara que ou é corrido como root (ou sob L) ou o construtor " -"disponibilizou a variável de ambiente B (ex. via dpkg-" -"buildpackage -r)." +"disponibilizou a variável de ambiente B (ex. via " +"dpkg-buildpackage -r)." #. type: textblock #: dh_testroot:55 @@ -10122,9 +10041,9 @@ msgid "" msgstr "" "Se um directório é da posse de root:root, então o dono é determinado na " "altura da instalação. Os bits de posse e permissões irão ser ou root:root " -"modo 0755 ou root:staff modo 02775. A escolha depende em se o sistema tem " -"F (como documentado no Manual de Politica " -"Debian §9.1.2 desde a versão 4.1.4)" +"modo 0755 ou root:staff modo 02775. A escolha depende em se o sistema " +"tem F (como documentado no Manual de " +"Politica Debian §9.1.2 desde a versão 4.1.4)" #. type: textblock #: dh_usrlocal:68 -- cgit v1.2.3 From 9462d4a589889ada66a938f16486ef57d2e1be7e Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 21 Jul 2019 18:41:55 +0000 Subject: dh_installsystemduser: Fix bug in sorting of unit files Signed-off-by: Niels Thykier --- debian/changelog | 9 +++++++-- dh_installsystemduser | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 92972c11..9a6663fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -debhelper (12.2.4) UNRELEASED; urgency=medium +debhelper (12.2.5) UNRELEASED; urgency=medium [ Translations ] * Update Portuguese translation (Américo Monteiro) (Closes: #927394) - -- Niels Thykier Sat, 20 Jul 2019 07:20:56 +0000 + [ Niels Thykier ] + * dh_installsystemduser: Fix bug that would neuter sorting of unit + files and make the resulting maintscripts unreproducible. Thanks + to Daniel Kahn Gillmor for reporting the bug. (Closes: #932646) + + -- Niels Thykier Sun, 21 Jul 2019 18:40:38 +0000 debhelper (12.2.3) unstable; urgency=medium diff --git a/dh_installsystemduser b/dh_installsystemduser index bc1d0368..cd9ee12c 100755 --- a/dh_installsystemduser +++ b/dh_installsystemduser @@ -244,7 +244,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { push @enable_units, $name if contains_install_section($path); } - @enable_units = map { quote($_) } sort uniq @enable_units; + @enable_units = map { quote($_) } sort(uniq(@enable_units)); if (@enable_units) { # The generated maintainer script code blocks use the --user -- cgit v1.2.3 From a11511fa81514766ef228e2e51cf33d0548f9c53 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 6 Aug 2019 14:46:21 +0000 Subject: dh_dwz: Stop passing -q to dwz Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_dwz | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9a6663fa..80f2fd52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ debhelper (12.2.5) UNRELEASED; urgency=medium * dh_installsystemduser: Fix bug that would neuter sorting of unit files and make the resulting maintscripts unreproducible. Thanks to Daniel Kahn Gillmor for reporting the bug. (Closes: #932646) + * dh_dwz: Remove the -q flag when calling dwz(1). It is + sufficiently silently with -q and aids with debugging for others. + (Closes: #933561, #931792) -- Niels Thykier Sun, 21 Jul 2019 18:40:38 +0000 diff --git a/dh_dwz b/dh_dwz index a714c766..543c7da4 100755 --- a/dh_dwz +++ b/dh_dwz @@ -112,7 +112,6 @@ for my $package (@{$dh{DOPACKAGES}}) { # Consistent order; @elf_files = sort(@elf_files); my ($unique_files, $hardlinks) = find_hardlinks(@elf_files); - my @dwz_options; if ($create_multifile and @{$unique_files} > 1) { my $objcopy = cross_command($package, 'objcopy'); my $ma_dir = dpkg_architecture_value('DEB_HOST_MULTIARCH'); @@ -120,10 +119,10 @@ for my $package (@{$dh{DOPACKAGES}}) { my $m = "${dwz_dir}/${package}.debug"; my @dwz_options = ("-m${tmp}/${m}", "-M/${m}"); install_dir("${tmp}/${dwz_dir}"); - doit('dwz', '-q', @dwz_options, @{$dh{U_PARAMS}}, '--', @{$unique_files}); + doit('dwz', @dwz_options, @{$dh{U_PARAMS}}, '--', @{$unique_files}); doit($objcopy, '--compress-debug-sections', "${tmp}/${m}"); } else { - xargs($unique_files, 'dwz', '-q', @{$dh{U_PARAMS}}, '--'); + xargs($unique_files, 'dwz', @{$dh{U_PARAMS}}, '--'); } -- cgit v1.2.3 From cc50a4c743d2d92b8280bccbce495b88cb3d86ea Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 6 Aug 2019 14:52:49 +0000 Subject: dh_dwz: Cope with missing multifiles by default Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ dh_dwz | 27 ++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 80f2fd52..0f683d63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,10 @@ debhelper (12.2.5) UNRELEASED; urgency=medium * dh_dwz: Remove the -q flag when calling dwz(1). It is sufficiently silently with -q and aids with debugging for others. (Closes: #933561, #931792) + * dh_dwz: Gracefully handle when dwz fails to create a multifile + but succeeds anyway by default. The previous behaviour of + insisting on a multifile can be obtained by explicitly passing + --dwz-multifile. (Closes: #933541) -- Niels Thykier Sun, 21 Jul 2019 18:40:38 +0000 diff --git a/dh_dwz b/dh_dwz index 543c7da4..c5463a03 100755 --- a/dh_dwz +++ b/dh_dwz @@ -30,9 +30,17 @@ running L on all the ELF binaries in the package. =item B<--dwz-multifile>, B<--no-dwz-multifile> Whether L should generate a I from the ELF binaries -in the same package (it does by default). When enabled, if a package -ships at least 2 ELF binaries, B will instruct L to -generate a multifile for the package. +in the same package. When enabled, if a package ships at least 2 ELF +binaries, B will instruct L to generate a multifile +for the package. + +By default, B will attempt to create a multifile but will +continue without if L does create one (but succeeds anyway). +This commonly happens when the debug files do not contain debug +symbols (e.g. a missing -g to the compiler) or when the debug +symbols are compressed (see Debian bug #931891). If B<--dwz-multifile> +is passed, then B will abort with an error if L does +not create a multifile. Note this options may not work if a package contains more ELF binaries than can fit on a single command line. If this becomes a problem, @@ -68,7 +76,7 @@ test"-cycles) rather than optimizing for size. =cut -my $create_multifile = 1; +my $create_multifile = 'auto'; init(options => { 'dwz-multifile!' => \$create_multifile, @@ -120,7 +128,16 @@ for my $package (@{$dh{DOPACKAGES}}) { my @dwz_options = ("-m${tmp}/${m}", "-M/${m}"); install_dir("${tmp}/${dwz_dir}"); doit('dwz', @dwz_options, @{$dh{U_PARAMS}}, '--', @{$unique_files}); - doit($objcopy, '--compress-debug-sections', "${tmp}/${m}"); + if ( -f "${tmp}/${m}") { + doit($objcopy, '--compress-debug-sections', "${tmp}/${m}"); + } else { + error("dwz failed to create a multifile as requested") if $create_multifile ne 'auto'; + warning("No dwz multifile created, but not explicitly requested either so ignoring it."); + warning("Common issues include no debug information at all (missing -g) and"); + warning("compressed debug information (#931891)."); + # Clean up after ourselves to avoid leaving empty directories in packages + doit('rmdir', '-p', '--ignore-fail-on-non-empty', "${tmp}/usr/lib/debug/.dwz/${ma_dir}"); + } } else { xargs($unique_files, 'dwz', @{$dh{U_PARAMS}}, '--'); } -- cgit v1.2.3 From 67f50881f41c71df2dff8991e1767a6325e90649 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 6 Aug 2019 15:05:50 +0000 Subject: dh_dwz: Skip multifile for udeb packages Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ dh_dwz | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0f683d63..8d1d065c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ debhelper (12.2.5) UNRELEASED; urgency=medium but succeeds anyway by default. The previous behaviour of insisting on a multifile can be obtained by explicitly passing --dwz-multifile. (Closes: #933541) + * dh_dwz: Skip multifile generation for udeb packages. + (Closes: #933212) -- Niels Thykier Sun, 21 Jul 2019 18:40:38 +0000 diff --git a/dh_dwz b/dh_dwz index c5463a03..471930b9 100755 --- a/dh_dwz +++ b/dh_dwz @@ -49,6 +49,10 @@ please pass B<--no-dwz-multifile> to work around the issue. The generated multifile will be compressed with B. +Note for B packages: B will never generate multifiles +for B packages. It will still use B to reduce the +file size of debug files if it finds any. + =item B<-X>I, B<--exclude=>I Exclude files that contain I anywhere in their filename from being @@ -120,7 +124,7 @@ for my $package (@{$dh{DOPACKAGES}}) { # Consistent order; @elf_files = sort(@elf_files); my ($unique_files, $hardlinks) = find_hardlinks(@elf_files); - if ($create_multifile and @{$unique_files} > 1) { + if ($create_multifile and @{$unique_files} > 1 and not is_udeb($package)) { my $objcopy = cross_command($package, 'objcopy'); my $ma_dir = dpkg_architecture_value('DEB_HOST_MULTIARCH'); my $dwz_dir = "usr/lib/debug/.dwz/${ma_dir}"; -- cgit v1.2.3 From fc8b751d1c763da1adc8adb7940db6ae068628dd Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 24 Feb 2019 17:18:14 +0000 Subject: dh_makeshlibs: Auto-detect udeb package for a deb Signed-off-by: Niels Thykier --- debian/changelog | 9 ++++++++- dh_makeshlibs | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8d1d065c..3afe483d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.2.5) UNRELEASED; urgency=medium +debhelper (12.3) UNRELEASED; urgency=medium [ Translations ] * Update Portuguese translation (Américo Monteiro) (Closes: #927394) @@ -16,6 +16,13 @@ debhelper (12.2.5) UNRELEASED; urgency=medium --dwz-multifile. (Closes: #933541) * dh_dwz: Skip multifile generation for udeb packages. (Closes: #933212) + * dh_makeshlibs: Attempt to automatically detect udeb packages + for a given (non-udeb) library package. In simple cases, it + can replace the need for an explicit --add-udeb parameter. + However, there are many cases where the auto-detection falls + short and --add-udeb is still needed (see dh_makeshlibs(1) + for details). Packagers are advised to verify the resulting + shlibs file before removing --add-udeb in an upload. -- Niels Thykier Sun, 21 Jul 2019 18:40:38 +0000 diff --git a/dh_makeshlibs b/dh_makeshlibs index 03f6a7c3..796c4297 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -26,6 +26,21 @@ it finds shared libraries. Since debhelper 9.20151004, this is done via a dpkg trigger. In older versions of debhelper, B would generate a maintainer script for this purpose. +Since debhelper 12.3, B will by default add an additional +I line for udebs in the shlibs file, when the udeb has the same +name as the deb followed by a "-udeb" suffix (e.g. if the deb is called +"libfoo1", then debhelper will auto-detect the udeb if it is named +"libfoo1-udeb"). Please use the B<--add-udeb> and B<--no-add-udeb> options +below when this auto-detection is insufficient. + +If you previously used B<--add-udeb> and is considering to migrate to +using the auto-detection new auto-detection feature in 12.3, then +please remember to test that the resulting F files are +as expected. There are some known corner cases, where the +auto-detection is insufficient. These include when the udeb contains +library files from multiple regular deb packages or when the packages +do not follow the expected naming convention. + =head1 FILES =over 4 @@ -146,6 +161,15 @@ from being treated as shared libraries. Create an additional line for udebs in the shlibs file and use I as the package name for udebs to depend on instead of the regular library package. +This is option is only useful for special cases such as when debhelper +cannot auto-detect package name of the udeb package or when the udeb +will contain libaries from multiple deb packages. + +=item B<--no-add-udeb> + +Do not add any udeb lines to the shlibs file. This can be used to disable the +default auto-detection of udebs. + =item B<--> I Pass I to L. @@ -177,11 +201,14 @@ Generates a shlibs file that looks something like: =cut +my $shlibs_udeb; + init(options => { "m=s", => \$dh{M_PARAMS}, "major=s" => \$dh{M_PARAMS}, "version-info:s" => \$dh{V_FLAG}, - "add-udeb=s" => \$dh{SHLIBS_UDEB}, + "add-udeb=s" => \$shlibs_udeb, + "no-add-udeb" => sub { $shlibs_udeb = ''; }, }); my $ok=1; @@ -210,10 +237,16 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # because only if we can get a library name and a major number from # objdump is anything actually added. my $exclude=''; - my (@udeb_lines, @deb_lines, @lib_files); + my (@udeb_lines, @deb_lines, @lib_files, $udeb_name); if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') { $exclude="! \\( $dh{EXCLUDE_FIND} \\) "; } + if (defined($shlibs_udeb) && $shlibs_udeb ne '') { + $udeb_name = $shlibs_udeb; + } else { + my $guessed_udeb = "${package}-udeb"; + $udeb_name = $guessed_udeb if is_known_package($guessed_udeb) and is_udeb($guessed_udeb); + } open (FIND, "test -d $tmp && find $tmp -type f \\( -name '*.so' -or -name '*.so.*' \\) $exclude | LC_ALL=C sort |"); while (my $lib_file = ) { my ($library, $major); @@ -278,9 +311,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (! $seen{$line}) { $seen{$line}=1; push(@deb_lines, $line); - if (defined($dh{SHLIBS_UDEB}) && $dh{SHLIBS_UDEB} ne '') { + if (defined($udeb_name) && $udeb_name ne '') { my $udeb_deps = $deps; - $udeb_deps =~ s/\Q$package\E/$dh{SHLIBS_UDEB}/e; + $udeb_deps =~ s/\Q$package\E/$udeb_name/e; $line="udeb: $library $major $udeb_deps"; push @udeb_lines, $line; } -- cgit v1.2.3 From 654c00d73ae43a647621839c78b775959e9e69c5 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 6 Aug 2019 17:07:23 +0000 Subject: Release debhelper/12.3 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3afe483d..24e7abab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.3) UNRELEASED; urgency=medium +debhelper (12.3) unstable; urgency=medium [ Translations ] * Update Portuguese translation (Américo Monteiro) (Closes: #927394) @@ -24,7 +24,7 @@ debhelper (12.3) UNRELEASED; urgency=medium for details). Packagers are advised to verify the resulting shlibs file before removing --add-udeb in an upload. - -- Niels Thykier Sun, 21 Jul 2019 18:40:38 +0000 + -- Niels Thykier Tue, 06 Aug 2019 16:55:26 +0000 debhelper (12.2.3) unstable; urgency=medium -- cgit v1.2.3 From 0c0d4cbd0e8919bfcb4c7dabbf01330d76870bcb Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 12 Aug 2019 15:06:50 +0000 Subject: dh: Remove support for --{until,after,before,remaining} Signed-off-by: Niels Thykier --- debhelper.pod | 3 +++ debian/changelog | 11 +++++++++++ dh | 10 +++------- 3 files changed, 17 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index 425514e6..0e7d16c4 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -562,6 +562,9 @@ The B command will not accept any of the deprecated "manual sequence control" parameters (B<--before>, B<--after>, etc.). Please use override targets instead. +B: B no longer +accepts any of these since debhelper/12.4. + =item - The B command will no longer use log files to track which commands diff --git a/debian/changelog b/debian/changelog index 24e7abab..64233be3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +debhelper (12.4) UNRELEASED; urgency=medium + + * dh: Retroactively remove support for manual dh sequence + operators (--until, --after, --before and --remaining). + This breaks about 8 source packages that still rely on this + feature and have not yet migrated away. (Closes: #932537) + Please see the debhelper bug for relevant bug numbers and + package names. + + -- Niels Thykier Mon, 12 Aug 2019 15:04:36 +0000 + debhelper (12.3) unstable; urgency=medium [ Translations ] diff --git a/dh b/dh index c45b2aea..a47af74b 100755 --- a/dh +++ b/dh @@ -332,7 +332,7 @@ init(options => { bundling => 0, ); set_buildflags(); -warn_deprecated(); +reject_obsolete_params(); # If make is using a jobserver, but it is not available # to this process, clean out MAKEFLAGS. This avoids @@ -994,14 +994,10 @@ sub stamp_target { } -sub warn_deprecated { +sub reject_obsolete_params { foreach my $deprecated ('until', 'after', 'before', 'remaining') { if (defined $dh{uc $deprecated}) { - if (compat(9)) { - warning("The --$deprecated option is deprecated. Use override targets instead."); - } else { - error("The --$deprecated option is not supported in compat 10+. Use override targets instead."); - } + error("The --$deprecated option is not supported any longer (#932537). Use override targets instead."); } } } -- cgit v1.2.3 From ce9e95ee0a17756fbd413fb22eae7ffa77abe538 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 12 Aug 2019 15:07:14 +0000 Subject: Release debhelper/12.4 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 64233be3..bcecb406 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.4) UNRELEASED; urgency=medium +debhelper (12.4) unstable; urgency=medium * dh: Retroactively remove support for manual dh sequence operators (--until, --after, --before and --remaining). @@ -7,7 +7,7 @@ debhelper (12.4) UNRELEASED; urgency=medium Please see the debhelper bug for relevant bug numbers and package names. - -- Niels Thykier Mon, 12 Aug 2019 15:04:36 +0000 + -- Niels Thykier Mon, 12 Aug 2019 15:07:01 +0000 debhelper (12.3) unstable; urgency=medium -- cgit v1.2.3 From 9471f431aa57347a8d2eebbec8031e16ea18b8f7 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Wed, 14 Aug 2019 15:27:59 +0000 Subject: dh_strip: Skip stripping of guile-2.2 files Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_strip | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bcecb406..2268e19c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ debhelper (12.4) unstable; urgency=medium feature and have not yet migrated away. (Closes: #932537) Please see the debhelper bug for relevant bug numbers and package names. + * dh_strip: Skip stripping of guile-2.2 files by skipping all + all files matching "/guile/.*\.go$". Thanks to Jeremy Bicha + and Rob Browning. (Closes: #907061) -- Niels Thykier Mon, 12 Aug 2019 15:07:01 +0000 diff --git a/dh_strip b/dh_strip index 3e8b300f..ab876360 100755 --- a/dh_strip +++ b/dh_strip @@ -188,7 +188,8 @@ sub testfile { return if -d _; # Is it a debug library in a debug subdir? - return if $fn=~m/debug\/.*\.so/; + return if $fn=~m{debug/.*\.so}; + return if $fn=~m{/guile/.*\.go$}; # Exploit the previous stat call to get the $mode, so we can check # later if it is executable or not. -- cgit v1.2.3 From cd0ee36b0c62ded4183dd3f2b2b7a359050a4234 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Wed, 14 Aug 2019 16:59:23 +0000 Subject: d/changelog: Move dh_strip remark to a UNRELEASED version Signed-off-by: Niels Thykier --- debian/changelog | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2268e19c..5005b346 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (12.4.1) UNRELEASED; urgency=medium + + * dh_strip: Skip stripping of guile-2.2 files by skipping all + all files matching "/guile/.*\.go$". Thanks to Jeremy Bicha + and Rob Browning. (Closes: #907061) + + -- Niels Thykier Wed, 14 Aug 2019 16:58:16 +0000 + debhelper (12.4) unstable; urgency=medium * dh: Retroactively remove support for manual dh sequence @@ -6,9 +14,6 @@ debhelper (12.4) unstable; urgency=medium feature and have not yet migrated away. (Closes: #932537) Please see the debhelper bug for relevant bug numbers and package names. - * dh_strip: Skip stripping of guile-2.2 files by skipping all - all files matching "/guile/.*\.go$". Thanks to Jeremy Bicha - and Rob Browning. (Closes: #907061) -- Niels Thykier Mon, 12 Aug 2019 15:07:01 +0000 -- cgit v1.2.3 From 442d9112a2d517d8f362f5013c6665a7f52a401e Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Thu, 15 Aug 2019 07:42:21 +0000 Subject: d/changelog: Describe Frank Schaefer's changes Signed-off-by: Niels Thykier --- debian/changelog | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5005b346..445f3967 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -debhelper (12.4.1) UNRELEASED; urgency=medium +debhelper (12.5) UNRELEASED; urgency=medium + [ Niels Thykier ] * dh_strip: Skip stripping of guile-2.2 files by skipping all all files matching "/guile/.*\.go$". Thanks to Jeremy Bicha and Rob Browning. (Closes: #907061) + [ Frank Schaefer ] + * dh_installmodules: Also lok for compressed kernel modules + in addition to uncompressed kernel modules (gz, bz2 or xz). + -- Niels Thykier Wed, 14 Aug 2019 16:58:16 +0000 debhelper (12.4) unstable; urgency=medium -- cgit v1.2.3 From dcb766ade2cd5e9415ee44fa6725508ae333769d Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Sat, 13 Apr 2019 11:54:53 +0200 Subject: Lintian override: package-does-not-use-debhelper-or-cdbs It uses the freshest possible version of debhelper! Closes: debian/debhelper!22 --- debian/changelog | 4 ++++ debian/source/lintian-overrides | 1 + 2 files changed, 5 insertions(+) create mode 100644 debian/source/lintian-overrides (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 445f3967..1deb6026 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ debhelper (12.5) UNRELEASED; urgency=medium * dh_installmodules: Also lok for compressed kernel modules in addition to uncompressed kernel modules (gz, bz2 or xz). + [ Adam Borowski ] + * d/s/lintian-overrides: Override lintian warning about debhelper + not using debhelper. + -- Niels Thykier Wed, 14 Aug 2019 16:58:16 +0000 debhelper (12.4) unstable; urgency=medium diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 00000000..e1b2927b --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1 @@ +debhelper source: package-does-not-use-debhelper-or-cdbs -- cgit v1.2.3 From d3e7d3e0293166ed836ae73073eb5fdd511b8693 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Thu, 15 Aug 2019 09:48:19 +0000 Subject: dh_auto_*: Officially adopt --sourcedir/--builddir Since the beginning, debhelper has accepted abbrevated command line parameters. Anyone that has been using (e.g.): dh $@ --sourcedir=foo To pass --sourcedir to dh_install has *also* implicitly passed it to the dh_auto_* helpers. Due to auto-abbrevation being enabled, they have considered it a short form of --sourcedirectory. This is trivially confirmable by comparing: dh_auto_configure --bar foo Unknown option: bar dh_auto_configure: unknown option or error during option parsing; aborting with dh_auto_configure --sourcedir foo dh_auto_configure: invalid or non-existing path to the source directory: foo Signed-off-by: Niels Thykier --- debhelper.pod | 4 ++-- debian/changelog | 4 ++++ dh | 2 +- lib/Debian/Debhelper/Dh_Buildsystems.pm | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index 19d3c504..9d80eb67 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -254,13 +254,13 @@ BI<*> programs. Force use of the specified I, instead of trying to auto-select one which might be applicable for the package. -=item B<-D>I, B<--sourcedirectory=>I +=item B<-D>I, B<--sourcedir=>I, B<--sourcedirectory=>I Assume that the original package source tree is at the specified I rather than the top level directory of the Debian source package tree. -=item B<-B>[I], B<--builddirectory=>[I] +=item B<-B>[I], B<--builddir>[I<=directory>], B<--builddirectory>[I<=directory>] Enable out of source building and use the specified I as the build directory. If I parameter is omitted, a default build directory diff --git a/debian/changelog b/debian/changelog index 1deb6026..0212db9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ debhelper (12.5) UNRELEASED; urgency=medium * dh_strip: Skip stripping of guile-2.2 files by skipping all all files matching "/guile/.*\.go$". Thanks to Jeremy Bicha and Rob Browning. (Closes: #907061) + * dh_auto_*: Officially adopt --sourcedir and --builddir as official + parameters. They have always worked since debhelper defaulted to + supporting auto-abbreviated parameters, so this is simply documenting + fait accompli for the most common abbreviation. [ Frank Schaefer ] * dh_installmodules: Also lok for compressed kernel modules diff --git a/dh b/dh index 82e80715..5cc5bb34 100755 --- a/dh +++ b/dh @@ -9,7 +9,7 @@ dh - debhelper command sequencer use strict; use warnings; use constant { - 'UNSKIPPABLE_CLI_OPTIONS_BUILD_SYSTEM' => q(-S|--buildsystem|-D|--sourcedirectory|-B|--builddirectory), + 'UNSKIPPABLE_CLI_OPTIONS_BUILD_SYSTEM' => q(-S|--buildsystem|-D|--sourcedir(?:ectory)?|-B|--builddir(?:ectory)?), }; use Debian::Debhelper::Dh_Lib; use Debian::Debhelper::SequencerUtil; diff --git a/lib/Debian/Debhelper/Dh_Buildsystems.pm b/lib/Debian/Debhelper/Dh_Buildsystems.pm index a386507c..d0e69d8c 100644 --- a/lib/Debian/Debhelper/Dh_Buildsystems.pm +++ b/lib/Debian/Debhelper/Dh_Buildsystems.pm @@ -185,9 +185,11 @@ sub buildsystems_init { # Available command line options my %options = ( "D=s" => \$opt_sourcedir, + "sourcedir=s" => \$opt_sourcedir, "sourcedirectory=s" => \$opt_sourcedir, "B:s" => \$opt_builddir, + "builddir:s" => \$opt_builddir, "builddirectory:s" => \$opt_builddir, "S=s" => \$opt_buildsys, -- cgit v1.2.3 From 4300655ff734dd14551040d61c721838fcbaf7af Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Thu, 15 Aug 2019 10:16:02 +0000 Subject: Disable auto-abbrev of cli options in c13 to enable dh optimizations Disable auto-abbreviation of command-line options in compat 13 and re-enable dh's optimization for skipping redundant commands when passed long options. Signed-off-by: Niels Thykier --- debhelper.pod | 8 ++++++++ debian/changelog | 4 ++++ dh | 12 +++++++++--- lib/Debian/Debhelper/Dh_Getopt.pm | 3 +++ 4 files changed, 24 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index 9d80eb67..dca9a572 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -944,6 +944,14 @@ B that passes extra parameters to upstream test runner should be reviewed as B is not command line compatible with B. +=item - + +All debhelper like tools based on the official debhelper library +(including B and the official B tools) no longer accepts +abbreviated command parameters. At the same time, B now +optimizes out calls to redundant B helpers even when passed +long command line options. + =back =back diff --git a/debian/changelog b/debian/changelog index 0212db9e..4c92f5dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ debhelper (12.5) UNRELEASED; urgency=medium parameters. They have always worked since debhelper defaulted to supporting auto-abbreviated parameters, so this is simply documenting fait accompli for the most common abbreviation. + * dh_*: Disable auto-abbreviation of command line parameters in compat + 13. + * dh: Optimize out redundant helpers even when passed long options in + compat 13. [ Frank Schaefer ] * dh_installmodules: Also lok for compressed kernel modules diff --git a/dh b/dh index 5cc5bb34..547ad899 100755 --- a/dh +++ b/dh @@ -612,7 +612,7 @@ my %completed_sequences; # Get the options to pass to commands in the sequence. # Filter out options intended only for this program. my (@options, %seen_options); -my ($unoptimizable_user_option, $long_options_seen) = (0, 0); +my ($unoptimizable_user_option, $unoptimizable_option_bundle) = (0, 0); if ($sequence eq 'build-arch' || $sequence eq 'install-arch' || @@ -654,7 +654,13 @@ while (@ARGV_orig) { } if ($opt =~ m/^(--[^=]++)(?:=.*)?$/ or $opt =~ m/^(-[^-])$/) { my $optname = $1; - $long_options_seen = 1 if length($optname) > 2; + if (length($optname) > 2 and (compat(12, 1) or m/^-[^-][^=]/)) { + # We cannot optimize bundled options but we can optimize a single + # short option with an explicit parameter (-B=F is ok, -BF is not) + # In compat 12 or earlier, we also punt on long options due to + # auto-abbreviation. + $unoptimizable_option_bundle = 1 + } $seen_options{$optname} = 1; } else { $unoptimizable_user_option = 1; @@ -1040,7 +1046,7 @@ sub can_skip { # Long options are subject to abbreviations so it is # very difficult to implement this optimization with # long options. - return 0 if $long_options_seen; + return 0 if $unoptimizable_option_bundle; $need =~ s/(?:^|\s)BUILDSYSTEM(?:\s|$)/${\UNSKIPPABLE_CLI_OPTIONS_BUILD_SYSTEM}/; my @behavior_options = split(qr/\Q|\E/, $need); for my $opt (@behavior_options) { diff --git a/lib/Debian/Debhelper/Dh_Getopt.pm b/lib/Debian/Debhelper/Dh_Getopt.pm index a35d9588..591f0e22 100644 --- a/lib/Debian/Debhelper/Dh_Getopt.pm +++ b/lib/Debian/Debhelper/Dh_Getopt.pm @@ -95,6 +95,9 @@ sub getoptions { Getopt::Long::config("bundling"); } Getopt::Long::config('no_ignore_case'); + if (! compat(12, 1)) { + Getopt::Long::config('no_auto_abbrev'); + } my @test; my %options=( -- cgit v1.2.3 From e91dbdba83aa60c0313fd68f92652f00d34c97b6 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Thu, 15 Aug 2019 10:39:48 +0000 Subject: dh_builddeb: Remove support for --destdir It is not useful as the packager cannot set it to anything as it is the builder that has an expectation of where the debs are produced. It would have been a lot more useful if the builder could have specified this value some how (but it would have to be aligned with dpkg with e.g. for the .changes). Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ dh_builddeb | 12 ++---------- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4c92f5dc..5a29dcef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ debhelper (12.5) UNRELEASED; urgency=medium 13. * dh: Optimize out redundant helpers even when passed long options in compat 13. + * dh_builddeb: Remove --destdir. It has never been useful as everyone + excepts the debs to be placed in "..". [ Frank Schaefer ] * dh_installmodules: Also lok for compressed kernel modules diff --git a/dh_builddeb b/dh_builddeb index 7d36fa3e..15d8ffd3 100755 --- a/dh_builddeb +++ b/dh_builddeb @@ -16,7 +16,7 @@ our $VERSION = DH_BUILTIN_VERSION; =head1 SYNOPSIS -B [S>] [B<--destdir=>I] [B<--filename=>I] [S I>] +B [S>] [B<--filename=>I] [S I>] =head1 DESCRIPTION @@ -35,11 +35,6 @@ L. =over 4 -=item B<--destdir=>I - -Use this if you want the generated F<.deb> files to be put in a directory -other than the default of "F<..>". - =item B<--filename=>I Use this if you want to force the generated .deb file to have a particular @@ -61,13 +56,10 @@ It is deprecated; use B<--> instead. init(options => { "filename=s" => \$dh{FILENAME}, - "destdir=s" => \$dh{DESTDIR}, }); # Set the default destination directory. -if (! defined $dh{DESTDIR}) { - $dh{DESTDIR}='..'; -} +$dh{DESTDIR}='..'; if (! defined $dh{FILENAME}) { $dh{FILENAME}=''; -- cgit v1.2.3 From 65e04527b7e0b967424caf91743c430b7c1e039d Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Thu, 15 Aug 2019 11:26:58 +0000 Subject: Dh_Lib: Add hint to resolve double-specified compat level Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ lib/Debian/Debhelper/Dh_Lib.pm | 3 +++ 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5a29dcef..ade017e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,10 @@ debhelper (12.5) UNRELEASED; urgency=medium compat 13. * dh_builddeb: Remove --destdir. It has never been useful as everyone excepts the debs to be placed in "..". + * Dh_Lib.pm: Add a hint to resolve the error caused by having the + compat level specified both as a build-dependency and in + debian/compat. Thanks to Alessandro Grassi for reporting the issue + on IRC. [ Frank Schaefer ] * dh_installmodules: Also lok for compressed kernel modules diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm index fe14039a..bb4ec646 100644 --- a/lib/Debian/Debhelper/Dh_Lib.pm +++ b/lib/Debian/Debhelper/Dh_Lib.pm @@ -834,6 +834,9 @@ my $compat_from_bd; warning("Please specify the debhelper compat level exactly once."); warning(" * debian/compat requests compat ${new_compat}."); warning(" * debian/control requests compat ${compat_from_bd} via \"debhelper-compat (= ${compat_from_bd})\""); + warning(); + warning("Hint: If you just added a build-dependency on debhelper-compat, then please remember to remove debian/compat"); + warning(); error("debhelper compat level specified both in debian/compat and via build-dependency on debhelper-compat"); } $c = $new_compat; -- cgit v1.2.3 From 28a7dd491b45c849ed8b09b73ecaba6202dd7e04 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 16 Aug 2019 10:53:15 +0000 Subject: dh_makeshlibs: Fix bug in --no-add-udeb Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ dh_makeshlibs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ade017e8..301eeed0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ debhelper (12.5) UNRELEASED; urgency=medium compat level specified both as a build-dependency and in debian/compat. Thanks to Alessandro Grassi for reporting the issue on IRC. + * dh_makeshlibs: Fix bug where --no-add-udeb could trigger the + auto-detection code. [ Frank Schaefer ] * dh_installmodules: Also lok for compressed kernel modules diff --git a/dh_makeshlibs b/dh_makeshlibs index cc1f864a..12581771 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -241,8 +241,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') { $exclude="! \\( $dh{EXCLUDE_FIND} \\) "; } - if (defined($shlibs_udeb) && $shlibs_udeb ne '') { - $udeb_name = $shlibs_udeb; + if (defined($shlibs_udeb)) { + $udeb_name = $shlibs_udeb if $shlibs_udeb ne ''; } else { my $guessed_udeb = "${package}-udeb"; $udeb_name = $guessed_udeb if is_known_package($guessed_udeb) and is_udeb($guessed_udeb); -- cgit v1.2.3 From f712198f7fa6eb971d0f3a961e195a566a03bb75 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 16 Aug 2019 11:09:31 +0000 Subject: Add Closes for dh_makeshlibs bug Signed-off-by: Niels Thykier --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 301eeed0..23a94e74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ debhelper (12.5) UNRELEASED; urgency=medium debian/compat. Thanks to Alessandro Grassi for reporting the issue on IRC. * dh_makeshlibs: Fix bug where --no-add-udeb could trigger the - auto-detection code. + auto-detection code. (Closes: #934891) [ Frank Schaefer ] * dh_installmodules: Also lok for compressed kernel modules -- cgit v1.2.3 From 6bf914b4eb15578a4f48dafae3ac16d95eddc55a Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 16 Aug 2019 17:55:10 +0000 Subject: dh_makeshlibs: Avoid including omitted libraries in the udeb on auto-detection Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ dh_makeshlibs | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 23a94e74..b9560aec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,10 @@ debhelper (12.5) UNRELEASED; urgency=medium on IRC. * dh_makeshlibs: Fix bug where --no-add-udeb could trigger the auto-detection code. (Closes: #934891) + * dh_makeshlibs: When using the auto-detection of udeb, automatically + exclude "udeb:" lines for libraries omitted from the udeb. At the + same time, verbosely fail if the udeb contains a library not present + in the deb (overridable with --add-udeb). (Closes: #934889) [ Frank Schaefer ] * dh_installmodules: Also lok for compressed kernel modules diff --git a/dh_makeshlibs b/dh_makeshlibs index ddefa475..e8b27445 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -162,8 +162,9 @@ Create an additional line for udebs in the shlibs file and use I as the package name for udebs to depend on instead of the regular library package. This is option is only useful for special cases such as when debhelper -cannot auto-detect package name of the udeb package or when the udeb -will contain libraries from multiple deb packages. +cannot auto-detect package name of the udeb package, when the udeb +will contain libraries from multiple deb packages, or when the udeb +contains libraries B present in the deb package. =item B<--no-add-udeb> @@ -201,7 +202,7 @@ Generates a shlibs file that looks something like: =cut -my $shlibs_udeb; +my ($shlibs_udeb, %known_udeb_solibs); init(options => { "m=s", => \$dh{M_PARAMS}, @@ -279,6 +280,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $guessed_udeb = "${package}-udeb"; $udeb_name = $guessed_udeb if is_known_package($guessed_udeb) and is_udeb($guessed_udeb); } + if (defined($udeb_name)) { + for my $so_data (_all_so_files($udeb_name, tmpdir($udeb_name))) { + my ($path, $library, $major) = @{$so_data}; + $known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"} = 1; + } + # If the udeb contains no SO files, then we there + if (not exists($known_udeb_solibs{$udeb_name})) { + error("The udeb $shlibs_udeb does not contain any shared libraries but --add-udeb=$shlibs_udeb was passed!?") + if defined($shlibs_udeb); + $udeb_name = undef; + } + } for my $so_data (_all_so_files($package, $tmp)) { my ($lib_file, $library, $major) = @{$so_data}; push(@lib_files, $lib_file) if compat(11); @@ -330,16 +343,33 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (! $seen{$line}) { $seen{$line}=1; push(@deb_lines, $line); - if (defined($udeb_name) && $udeb_name ne '') { + if (defined($udeb_name) && (defined($shlibs_udeb) or exists($known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"}))) { my $udeb_deps = $deps; $udeb_deps =~ s/\Q$package\E/$udeb_name/e; $line="udeb: $library $major $udeb_deps"; push @udeb_lines, $line; + delete($known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"}); } } } } + if (not defined($shlibs_udeb) and defined($udeb_name)) { + my $issues = 0; + for my $lib_key (sort(keys(%{$known_udeb_solibs{$udeb_name}}))) { + my ($library, $major) = split(qr/\x1f/, $lib_key); + warning("$udeb_name contains SO library $library (version $major) but $package does not contain a similar library!?"); + $issues = 1; + } + if ($issues) { + $ok = 0; + warning("Rejecting the generated shlibs file for $udeb_name!"); + warning("Hint: Either add the missing libraries to $package, remove them from $udeb_name, or"); + warning("Hint: (if this difference is expected) pass \"--add-udeb=$udeb_name\" to dh_makeshlibs."); + warning("Hint: In the latter case, you *may* also need to combine it with \"-p$package\""); + } + } + if ($shlibs_file) { install_dir("$tmp/DEBIAN"); install_file($shlibs_file, "$tmp/DEBIAN/shlibs"); -- cgit v1.2.3 From edf64efa348c91d631d090f36007fc1b872d02b3 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 16 Aug 2019 20:19:42 +0000 Subject: Update documentation and changelog to cover new sequence/addon features Signed-off-by: Niels Thykier --- debian/changelog | 11 +++++++++++ dh | 25 +++++++++++++++++++------ doc/PROGRAMMING | 17 +++++++++++++++++ 3 files changed, 47 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b9560aec..f3939ce0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,17 @@ debhelper (12.5) UNRELEASED; urgency=medium exclude "udeb:" lines for libraries omitted from the udeb. At the same time, verbosely fail if the udeb contains a library not present in the deb (overridable with --add-udeb). (Closes: #934889) + * dh: Support making "dh-sequence-ADDON" Build-Depends relation + conditonal on build-profiles (etc.). If the relation is ignored due + to the current build-profiles (etc.), then addon is silently skipped. + * dh: Support running addons in "arch-only" or "indep-only" mode by + adding "dh-sequence-ADDON" in Build-Depends-Arch or + Build-Depends-Indep (respectively). Not all addons support this and + will trigger an error at load time. Addon providers should ensure + that their package provde "dh-sequence-ADDON" and review the + doc/PROGRAMMING document (in the debhelper source) if they are + considering to make their addon compatible with these requirements. + (Closes: #836699) [ Frank Schaefer ] * dh_installmodules: Also lok for compressed kernel modules diff --git a/dh b/dh index f6f9ad7e..6c41d24e 100755 --- a/dh +++ b/dh @@ -62,12 +62,25 @@ the sequence addon interface. A B relation on the package BI implies a B<--with> I. This avoids the need for an explicit B<--with> in F that only duplicates what is already -declared via the build dependencies in F. Note that -only relations in the B field are considered -(i.e. B and B are -deliberately unsupported). Please keep in mind that B insists on -"simple" relations (e.g. a relation like "BI | -B" will I imply B<--with> I). +declared via the build dependencies in F. The +relation can (since 12.5) be made optional via e.g. +build-profiles. This enables you to easily disable an addon that +is only useful with certain profiles (e.g. to facilitate +bootstraping). + +Since debhelper 12.5, addons can also be activated in B-only +mode (via B) or B-only mode (via +B). Such addons are only active in the particular +sequence (e.g. B) which simplifies dependency +management for cross-builds. + +Please note that addons activated via B or +B are subject to additional limitations to +ensure the result is deterministic even when the addon is +unavailable (e.g. during clean). This implies that some addons +are incompatible with these restrictions and can only be used via +B (or manually via F). Currently, +such addons can only add commands to sequences. =item B<--without> I diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING index 893b87fc..ce13c53a 100644 --- a/doc/PROGRAMMING +++ b/doc/PROGRAMMING @@ -431,30 +431,47 @@ calling some functions from Dh_Lib: insert_before($existing_command, $new_command) Insert $new_command in sequences before $existing_command + Compatible with "arch-only"/"indep-only" modes if the command + appears only in a compatible sequence. + insert_after($existing_command, $new_command) Insert $new_command in sequences after $existing_command + Compatible with "arch-only"/"indep-only" modes if the command + appears only in a compatible sequence. + remove_command($existing_command) Remove $existing_command from the list of commands to run in all sequences. + Cannot be used in "arch-only"/"indep-only" mode. + add_command($new_command, $sequence) Add $new_command to the beginning of the specified sequence. If the sequence does not exist, it will be created. + Compatible with "arch-only"/"indep-only" modes if $sequence + is an "-arch" or "-indep" sequence (respectively). + add_command_options($command, $opt1, $opt2, ...) Append $opt1, $opt2 etc. to the list of additional options which dh passes when running the specified $command. These options are not relayed to debhelper commands called via $command override. + Cannot be used in "arch-only"/"indep-only" mode. + remove_command_options($command) Clear all additional $command options previously added with add_command_options(). + Cannot be used in "arch-only"/"indep-only" mode. + remove_command_options($command, $opt1, $opt2, ...) Remove $opt1, $opt2 etc. from the list of additional options which dh passes when running the specified $command. + Cannot be used in "arch-only"/"indep-only" mode. + Logging helpers and dh_missing: ------------------------------- -- cgit v1.2.3 From e1b3f5f78e6230a7ef161c08d1d204dad0777442 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 17 Aug 2019 08:02:25 +0000 Subject: Rewrite special-casing of ELF tools (dh_strip etc.) via an elf-tools sequence Signed-off-by: Niels Thykier --- debhelper.pod | 10 +++++++ debian/changelog | 8 ++++++ debian/control | 2 ++ dh | 45 +++++++++++++++++------------- lib/Debian/Debhelper/Sequence/elf_tools.pm | 14 ++++++++++ 5 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 lib/Debian/Debhelper/Sequence/elf_tools.pm (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index dca9a572..8ef49ce6 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -952,6 +952,16 @@ abbreviated command parameters. At the same time, B now optimizes out calls to redundant B helpers even when passed long command line options. +=item - + +The ELF related debhelper tools (B, B, B, +B) are now only run for arch dependent packages by default +(i.e. they are excluded from B<*-indep> targets and are passed B<-a> +by default). + +If you need them for B<*-indep> targets, you can add an explicit +Build-Depends on B. + =back =back diff --git a/debian/changelog b/debian/changelog index f3939ce0..d25d70db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,14 @@ debhelper (12.5) UNRELEASED; urgency=medium doc/PROGRAMMING document (in the debhelper source) if they are considering to make their addon compatible with these requirements. (Closes: #836699) + * dh,elf_tools.pm: Extract the ELF related debhelper tools (dh_strip, + dh_dwz, dh_makeshlibs, dh_shlibdeps) into their own addon called + "elf-tools" enabled by the default. + * debian/control: Provide dh-sequence-elf-tools. + * dh: In compat 13, the "elf-tools" addon is considered an implicit + "arch-only" addon (i.e. they are only available in "-arch" sequences + and are always passed a "-a"). If you need the ELF tools for arch:all + packages, please add an explicit Builds-Depends on dh-sequence-elf-tools. [ Frank Schaefer ] * dh_installmodules: Also lok for compressed kernel modules diff --git a/debian/control b/debian/control index cf598526..4041e335 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Niels Thykier , Build-Depends: dpkg-dev (>= 1.18.0~), perl:any, po4a, + dh-sequence-elf-tools, Rules-Requires-Root: no Standards-Version: 4.4.0 Testsuite: autopkgtest-pkg-perl @@ -49,6 +50,7 @@ Replaces: dh-systemd (<< 1.38) Suggests: dh-make Provides: ${dh:CompatLevels}, dh-sequence-dwz, + dh-sequence-elf-tools, dh-sequence-installinitramfs, dh-sequence-systemd, Multi-Arch: foreign diff --git a/dh b/dh index a7423297..57a418da 100755 --- a/dh +++ b/dh @@ -419,19 +419,9 @@ qw{ dh_fixperms dh_missing }); -my @ba=(map { - { - 'command' => $_, - 'command-options' => [], - 'sequence-limitation' => SEQUENCE_TYPE_ARCH_ONLY, - } -} ( - (!compat(11) ? qw(dh_dwz) : qw()), -qw{ - dh_strip - dh_makeshlibs - dh_shlibdeps -})); + +# Looking for dh_dwz, dh_strip, dh_makeshlibs, dh_shlibdeps (et al)? They are +# in the elf-tools addon. my @b=qw{ dh_installdeb dh_gencontrol @@ -455,7 +445,7 @@ sub _add_sequence { _add_sequence('build', SEQUENCE_ARCH_INDEP_SUBSEQUENCES, @bd); _add_sequence('install', SEQUENCE_ARCH_INDEP_SUBSEQUENCES, to_rules_target("build"), @i); -_add_sequence('binary', SEQUENCE_ARCH_INDEP_SUBSEQUENCES, to_rules_target("install"), @ba, @b); +_add_sequence('binary', SEQUENCE_ARCH_INDEP_SUBSEQUENCES, to_rules_target("install"), @b); _add_sequence('clean', SEQUENCE_NO_SUBSEQUENCES, @bd_minimal, qw{ dh_auto_clean dh_clean @@ -664,10 +654,28 @@ sub list_addons { sub _compute_addons { my ($sequence_name, @addon_requests_from_args) = @_; - my (@enabled_addons, %disabled_addons, %enabled, $bd_dh_sequences_ref); + my (@enabled_addons, %disabled_addons, %enabled); my @addon_requests; my $sequence_type = sequence_type($sequence_name); + my %addon_constraints = %{ Debian::Debhelper::Dh_Lib::bd_dh_sequences() }; + + # Inject elf-tools early as other addons rely on their presence and it historically + # has been considered a part of the "core" sequence. + if (exists($addon_constraints{'elf-tools'})) { + # Explicitly requested; respect that + push(@addon_requests, '+elf-tools'); + } elsif (compat(12, 1)) { + # In compat 12 and earlier, we only inject the sequence if there are arch + # packages present. + push(@addon_requests, '+elf-tools') if getpackages('arch'); + } else { + # In compat 13, we always inject the addon if not explicitly requested and + # then flag it as arch_only + push(@addon_requests, '+elf-tools'); + $addon_constraints{'elf-tools'} = SEQUENCE_TYPE_ARCH_ONLY if not exists($addon_constraints{'elf-tools'}); + } + # Order is important; DH_EXTRA_ADDONS must come before everything # else; then comes built-in and finally argument provided add-ons # requests. @@ -683,9 +691,8 @@ sub _compute_addons { push(@addon_requests, '+systemd') if compat(10, 1); push(@addon_requests, '+build-stamp'); } - $bd_dh_sequences_ref = Debian::Debhelper::Dh_Lib::bd_dh_sequences(); - for my $addon_name (sort(keys(%{$bd_dh_sequences_ref}))) { - my $addon_type = $bd_dh_sequences_ref->{$addon_name}; + for my $addon_name (sort(keys(%addon_constraints))) { + my $addon_type = $addon_constraints{$addon_name}; if ($addon_type eq 'both' or $sequence_type eq 'both' or $addon_type eq $sequence_type) { push(@addon_requests, "+${addon_name}"); } @@ -720,7 +727,7 @@ sub _compute_addons { return map { { 'name' => $_, - 'addon-type' => $bd_dh_sequences_ref->{$_} // 'both', + 'addon-type' => $addon_constraints{$_} // SEQUENCE_TYPE_BOTH, } } @enabled_addons; } diff --git a/lib/Debian/Debhelper/Sequence/elf_tools.pm b/lib/Debian/Debhelper/Sequence/elf_tools.pm new file mode 100644 index 00000000..2780bc9e --- /dev/null +++ b/lib/Debian/Debhelper/Sequence/elf_tools.pm @@ -0,0 +1,14 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use Debian::Debhelper::Dh_Lib; + +insert_after('dh_missing', 'dh_strip'); +if (not compat(11)) { + insert_before('dh_strip', 'dh_dwz'); +} +insert_after('dh_strip', 'dh_makeshlibs'); +insert_after('dh_makeshlibs', 'dh_shlibdeps'); + +1; \ No newline at end of file -- cgit v1.2.3 From 5ac135e86dea2aa581d1cc2556659e84cbffd6d6 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 17 Aug 2019 08:02:45 +0000 Subject: d/changelog: Fix typo Signed-off-by: Niels Thykier --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d25d70db..72dd16a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,7 +25,7 @@ debhelper (12.5) UNRELEASED; urgency=medium same time, verbosely fail if the udeb contains a library not present in the deb (overridable with --add-udeb). (Closes: #934889) * dh: Support making "dh-sequence-ADDON" Build-Depends relation - conditonal on build-profiles (etc.). If the relation is ignored due + conditional on build-profiles (etc.). If the relation is ignored due to the current build-profiles (etc.), then addon is silently skipped. * dh: Support running addons in "arch-only" or "indep-only" mode by adding "dh-sequence-ADDON" in Build-Depends-Arch or -- cgit v1.2.3 From ef17dcbbba146c69e40376fc4b25328b05949fcf Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 17 Aug 2019 10:08:39 +0000 Subject: d/changelog: Fix typo Signed-off-by: Niels Thykier --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 72dd16a8..fa993876 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,7 +45,7 @@ debhelper (12.5) UNRELEASED; urgency=medium packages, please add an explicit Builds-Depends on dh-sequence-elf-tools. [ Frank Schaefer ] - * dh_installmodules: Also lok for compressed kernel modules + * dh_installmodules: Also look for compressed kernel modules in addition to uncompressed kernel modules (gz, bz2 or xz). [ Adam Borowski ] -- cgit v1.2.3 From 1863cb1976202abe04508abdb2b50626d9e3ac6f Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 17 Aug 2019 10:09:11 +0000 Subject: d/control: Remove B-D only inserted for local testing Signed-off-by: Niels Thykier --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 4041e335..ea89ab96 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: Niels Thykier , Build-Depends: dpkg-dev (>= 1.18.0~), perl:any, po4a, - dh-sequence-elf-tools, Rules-Requires-Root: no Standards-Version: 4.4.0 Testsuite: autopkgtest-pkg-perl -- cgit v1.2.3 From 177d646d200c3a851f32729965b31b2eca83ff46 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 17 Aug 2019 10:54:25 +0000 Subject: Release debhelper/12.5 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fa993876..c317e3e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.5) UNRELEASED; urgency=medium +debhelper (12.5) unstable; urgency=medium [ Niels Thykier ] * dh_strip: Skip stripping of guile-2.2 files by skipping all @@ -52,7 +52,7 @@ debhelper (12.5) UNRELEASED; urgency=medium * d/s/lintian-overrides: Override lintian warning about debhelper not using debhelper. - -- Niels Thykier Wed, 14 Aug 2019 16:58:16 +0000 + -- Niels Thykier Sat, 17 Aug 2019 10:54:08 +0000 debhelper (12.4) unstable; urgency=medium -- cgit v1.2.3 From 14d3765687545804842f48cb7d0268065da40b69 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 17 Aug 2019 12:41:50 +0000 Subject: dh_installdeb: Allow "+" in token names Signed-off-by: Niels Thykier --- debian/changelog | 7 +++++++ dh_installdeb | 2 +- lib/Debian/Debhelper/Dh_Lib.pm | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c317e3e2..cd3e8f03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (12.5.1) UNRELEASED; urgency=medium + + * dh_installdeb: Allow "+" to appear in token names as it is + a valid character for package names. + + -- Niels Thykier Sat, 17 Aug 2019 12:40:56 +0000 + debhelper (12.5) unstable; urgency=medium [ Niels Thykier ] diff --git a/dh_installdeb b/dh_installdeb index 73b7b43f..9f5f24c6 100755 --- a/dh_installdeb +++ b/dh_installdeb @@ -200,7 +200,7 @@ the concrete script. =head2 Limitations in token names -All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.]+# +All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.+]+# Tokens that do not match that regex will be silently ignored. diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm index 335873f3..7a55e22f 100644 --- a/lib/Debian/Debhelper/Dh_Lib.pm +++ b/lib/Debian/Debhelper/Dh_Lib.pm @@ -185,6 +185,7 @@ our $PKGVERSION_REGEX = qr/ [0-9][0-9A-Za-z.+:~]* # Upstream version (with no hyphens) (?: - [0-9A-Za-z.+:~]+ )* # Optional debian revision (+ upstreams versions with hyphens) /xoa; +our $MAINTSCRIPT_TOKEN_REGEX = qr/[A-Za-z0-9_.+]+/o; # From Policy 5.1: # @@ -2075,10 +2076,11 @@ sub debhelper_script_subst { verbose_print("[META] Replace #TOKEN#s in \"$tmp/DEBIAN/$script\""); } if (not $dh{NO_ACT}) { + my $regex = qr{#(${MAINTSCRIPT_TOKEN_REGEX})#}o; open(my $out_fd, '>', "$tmp/DEBIAN/$script") or error("open($tmp/DEBIAN/$script) failed: $!"); open(my $in_fd, '<', $file) or error("open($file) failed: $!"); while (my $line = <$in_fd>) { - $line =~ s{#([A-Za-z0-9_.]+)#}{$subst->($1) // "#${1}#"}ge; + $line =~ s{$regex}{$subst->($1) // "#${1}#"}ge; print {$out_fd} $line; } close($in_fd); -- cgit v1.2.3 From e6516b5f5b05106c4d34fc2eae6a185c01295864 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 17 Aug 2019 12:43:11 +0000 Subject: dh_installdeb: Detect invalid token names passed to -D in most cases Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ dh_installdeb | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cd3e8f03..0b10aefb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ debhelper (12.5.1) UNRELEASED; urgency=medium * dh_installdeb: Allow "+" to appear in token names as it is a valid character for package names. + * dh_installdeb: Reject invalid token names passed to -D or + --define (in most cases). -- Niels Thykier Sat, 17 Aug 2019 12:40:56 +0000 diff --git a/dh_installdeb b/dh_installdeb index 9f5f24c6..d15fb0e3 100755 --- a/dh_installdeb +++ b/dh_installdeb @@ -104,7 +104,7 @@ error in compat 12. Define tokens to be replaced inside the maintainer scripts when it is generated. Please note that the limitations described in L also applies to tokens defined -on the command line. +on the command line. Invalid token names will trigger an error. In the simple case, this parameter will cause B<< #I# >> to be replaced by I. If I starts with a literal @@ -202,7 +202,9 @@ the concrete script. All tokens intended to be substituted must match the regex: #[A-Za-z0-9_.+]+# -Tokens that do not match that regex will be silently ignored. +Tokens that do not match that regex will be silently ignored if found in the +script template. Invalid token names passed to B<-D> or B<--define> will +cause B to reject the command with an error in most cases. =cut @@ -393,6 +395,10 @@ sub per_package_subst { my %vars = %{$provided_subst}; $vars{'PACKAGE'} = $package if not exists($vars{'PACKAGE'}); for my $var (keys(%{$provided_subst})) { + if ($var !~ $Debian::Debhelper::Dh_Lib::MAINTSCRIPT_TOKEN_REGEX) { + warning("User defined token ${var} does not match ${Debian::Debhelper::Dh_Lib::MAINTSCRIPT_TOKEN_REGEX}"); + error("Invalid provided token ${var}: It cannot be substituted as it does not follow the token name rules"); + } if ($var =~ m/^pkg[.]\Q${package}\E[.](.+)$/) { my $new_key = $1; $vars{$new_key} = $provided_subst->{$var}; -- cgit v1.2.3 From a9c14ab96bd485f0abf3e45970fdd1053077be6a Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 17 Aug 2019 15:02:48 +0000 Subject: dh_makeshlibs: Fix bug in handling of -X Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_makeshlibs | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0b10aefb..88882b75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ debhelper (12.5.1) UNRELEASED; urgency=medium a valid character for package names. * dh_installdeb: Reject invalid token names passed to -D or --define (in most cases). + * dh_makeshlibs: Fix bug in -X where it would no longer match + as expected. A regression since 12.5 - thanks to Aurelien + Jarno for reporting the issue over IRC. -- Niels Thykier Sat, 17 Aug 2019 12:40:56 +0000 diff --git a/dh_makeshlibs b/dh_makeshlibs index e8b27445..fbb5f4ce 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -227,8 +227,9 @@ sub _all_so_files { # Only real/regular files -l && return; -f _ || return; - return if not is_so_or_exec_elf_file($_) or excludefile($_); my $path = "$File::Find::dir/$_"; + return if excludefile($path); + return if not is_so_or_exec_elf_file($_); push(@all_so_files, $path); }, $root_dir); -- cgit v1.2.3 From b392f7eeabb14de41a8ab16021a931322ee3bd99 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 17 Aug 2019 15:09:26 +0000 Subject: Release debhelper/12.5.1 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 88882b75..b42a80c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.5.1) UNRELEASED; urgency=medium +debhelper (12.5.1) unstable; urgency=medium * dh_installdeb: Allow "+" to appear in token names as it is a valid character for package names. @@ -8,7 +8,7 @@ debhelper (12.5.1) UNRELEASED; urgency=medium as expected. A regression since 12.5 - thanks to Aurelien Jarno for reporting the issue over IRC. - -- Niels Thykier Sat, 17 Aug 2019 12:40:56 +0000 + -- Niels Thykier Sat, 17 Aug 2019 15:09:07 +0000 debhelper (12.5) unstable; urgency=medium -- cgit v1.2.3 From 8b7810ca0659011579dc84476dae78b88d408747 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 18 Aug 2019 05:32:20 +0000 Subject: d/changelog: Fix typo Signed-off-by: Niels Thykier --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b42a80c5..4246df99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,7 +25,7 @@ debhelper (12.5) unstable; urgency=medium * dh: Optimize out redundant helpers even when passed long options in compat 13. * dh_builddeb: Remove --destdir. It has never been useful as everyone - excepts the debs to be placed in "..". + expects the debs to be placed in "..". * Dh_Lib.pm: Add a hint to resolve the error caused by having the compat level specified both as a build-dependency and in debian/compat. Thanks to Alessandro Grassi for reporting the issue -- cgit v1.2.3 From ba39d1934622f4ef97d8aec8d42deda260d1096c Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 18 Aug 2019 07:20:25 +0000 Subject: dh_makeshlibs: Restore "igore errors"-misfeature in compat 10 and earlier Signed-off-by: Niels Thykier --- debian/changelog | 8 ++++++++ dh_makeshlibs | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4246df99..589d861b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (12.5.2) UNRELEASED; urgency=medium + + * dh_makeshlibs: Fix regression in compat 10 and earlier where + dh_makeshlibs now failed on error. This safety check was + intended to be a compat 11 or later feature. + + -- Niels Thykier Sun, 18 Aug 2019 07:18:04 +0000 + debhelper (12.5.1) unstable; urgency=medium * dh_installdeb: Allow "+" to appear in token names as it is diff --git a/dh_makeshlibs b/dh_makeshlibs index fbb5f4ce..f0e45a93 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -235,8 +235,15 @@ sub _all_so_files { @all_so_files = sort(@all_so_files); for my $lib_file (@all_so_files) { - my $ret = qx_cmd($objdump, '-p', $lib_file); - my ($library, $major); + my ($library, $majorm, $ret); + if (compat(10)) { + # In compat 10, we silently ignored failing exit codes + # from objdump. Its horrible, but such was compat 10. + $ret = `$objdump -p "$lib_file"`; + chomp($ret); + } else { + $ret = qx_cmd($objdump, '-p', $lib_file); + } if ($ret=~m/\s+SONAME\s+(.*)\.so\.(.*)/) { # proper soname format $library=$1; -- cgit v1.2.3 From 77b205c763e937226a4e41365ed1f25b05297b16 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 18 Aug 2019 07:24:08 +0000 Subject: dh: Fix regression in dh addon API Previously, dh's API functions were sloppy in their return values but *often* they would return a truth value. We changed that in 12.5 by insisting on return undef. However, that broke addons relying on the API function to work around Perl's idiom of "module must end with a truth value". To resolve that, we now always return a truth value from all API functions to fix that. This also give consistent behaviour, which is better than the previous setup. Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 589d861b..ec806159 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ debhelper (12.5.2) UNRELEASED; urgency=medium * dh_makeshlibs: Fix regression in compat 10 and earlier where dh_makeshlibs now failed on error. This safety check was intended to be a compat 11 or later feature. + * dh: Ensure addon API functions return 1 to avoid gratious + breakage of addons due to perl's idiosyncrasy of requiring a + truth value at the end of modules. (See #935016) -- Niels Thykier Sun, 18 Aug 2019 07:18:04 +0000 diff --git a/dh b/dh index b55cbbd2..79d48ca3 100755 --- a/dh +++ b/dh @@ -553,12 +553,13 @@ sub _insert { for my $seq (@affected_sequences) { $seq->_insert($offset, $existing, _seq_cmd($new)); } + return 1; } sub insert_before { - _insert(-1, @_); + return _insert(-1, @_); } sub insert_after { - _insert(1, @_); + return _insert(1, @_); } sub remove_command { my ($command) = @_; @@ -566,11 +567,11 @@ sub remove_command { _assert_not_conditional_sequence_addon('remove_command'); my @affected_sequences = _sequences_containing_cmd($command); @affected_sequences = _filter_sequences_for_conditional_add_ons(@affected_sequences); - return if not @affected_sequences; + return 1 if not @affected_sequences; for my $seq (@affected_sequences) { $seq->remove_command($command); } - return; + return 1; } sub add_command { my ($command, $sequence) = @_; @@ -583,7 +584,7 @@ sub add_command { _filter_sequences_for_conditional_add_ons($seq); $seq->add_command_at_start(_seq_cmd($command)) } - return; + return 1; } sub add_command_at_end { my ($command, $sequence) = @_; @@ -596,7 +597,7 @@ sub add_command_at_end { _filter_sequences_for_conditional_add_ons($seq); $seq->add_command_at_end(_seq_cmd($command)) } - return; + return 1; } sub add_command_options { @@ -605,7 +606,7 @@ sub add_command_options { # and that implies smarter deduplication logic) _assert_not_conditional_sequence_addon('add_command_options'); push @{$command_opts{$command}}, @_; - return; + return 1; } sub remove_command_options { @@ -626,7 +627,7 @@ sub remove_command_options { # Clear all additional options delete $command_opts{$command}; } - return; + return 1; } sub list_addons { -- cgit v1.2.3 From 024b390510b7237edaa0b88c2492d3e9d93503b4 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 18 Aug 2019 07:36:34 +0000 Subject: Release debhelper/12.5.2 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ec806159..6a5c1c46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.5.2) UNRELEASED; urgency=medium +debhelper (12.5.2) unstable; urgency=medium * dh_makeshlibs: Fix regression in compat 10 and earlier where dh_makeshlibs now failed on error. This safety check was @@ -7,7 +7,7 @@ debhelper (12.5.2) UNRELEASED; urgency=medium breakage of addons due to perl's idiosyncrasy of requiring a truth value at the end of modules. (See #935016) - -- Niels Thykier Sun, 18 Aug 2019 07:18:04 +0000 + -- Niels Thykier Sun, 18 Aug 2019 07:36:20 +0000 debhelper (12.5.1) unstable; urgency=medium -- cgit v1.2.3 From e1d4bccac05c9c8d245cd74308a404c7ff59d0b9 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 18 Aug 2019 18:38:33 +0000 Subject: Avoid parsing d/control before handling --help/--list Signed-off-by: Niels Thykier --- debian/changelog | 13 +++++++++++++ lib/Debian/Debhelper/Dh_Getopt.pm | 2 +- lib/Debian/Debhelper/Dh_Lib.pm | 7 ++++--- 3 files changed, 18 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6a5c1c46..0ee55e2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +debhelper (12.5.3) UNRELEASED; urgency=medium + + * Dh_Getopt.pm: Skip compat call if d/control cannot be found + and just assume that auto-abbreviation can be disabled in that + case. This avoids breaking options such as --help and --list. + (Closes: #935017) + * Dh_Lib.pm: Jump to hoops to only parse the Build-Dependency + field in dh without breaking dh's own --list or --help + parameter. This fixes a regression since 12.5 where dh's + --help and --list options were broken. + + -- Niels Thykier Sun, 18 Aug 2019 18:33:50 +0000 + debhelper (12.5.2) unstable; urgency=medium * dh_makeshlibs: Fix regression in compat 10 and earlier where diff --git a/lib/Debian/Debhelper/Dh_Getopt.pm b/lib/Debian/Debhelper/Dh_Getopt.pm index 591f0e22..0f3fb781 100644 --- a/lib/Debian/Debhelper/Dh_Getopt.pm +++ b/lib/Debian/Debhelper/Dh_Getopt.pm @@ -95,7 +95,7 @@ sub getoptions { Getopt::Long::config("bundling"); } Getopt::Long::config('no_ignore_case'); - if (! compat(12, 1)) { + if ( ! -f 'debian/control' or ! compat(12, 1)) { Getopt::Long::config('no_auto_abbrev'); } diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm index 7a55e22f..47cca1fb 100644 --- a/lib/Debian/Debhelper/Dh_Lib.pm +++ b/lib/Debian/Debhelper/Dh_Lib.pm @@ -199,11 +199,13 @@ our $DEB822_FIELD_REGEX = qr/ [\x21-\x39\x3B-\x7F]* # Subsequent characters (if any) /xoa; +our $PARSE_DH_SEQUENCE_INFO = 0; + sub init { my %params=@_; if ($params{internal_parse_dh_sequence_info}) { - _parse_debian_control(1); + $PARSE_DH_SEQUENCE_INFO = 1; } # Check if we can by-pass the expensive Getopt::Long by optimising for the @@ -1587,7 +1589,6 @@ sub getpackages { } sub _parse_debian_control { - my ($parse_dh_sequence_info) = @_; my $package=""; my $arch=""; my $section=""; @@ -1699,7 +1700,7 @@ sub _parse_debian_control { error("Could not parse desired debhelper compat level from relation: $dep"); } # Build-Depends on dh-sequence- OR dh-sequence- ( ) - if ($parse_dh_sequence_info and $dep =~ m/^dh-sequence-(${PKGNAME_REGEX})\s*(?:[(]\s*(?:[<>]?=|<<|>>)\s*(?:${PKGVERSION_REGEX})\s*[)])?(\s*[^\|]+[]>]\s*)?$/) { + if ($PARSE_DH_SEQUENCE_INFO and $dep =~ m/^dh-sequence-(${PKGNAME_REGEX})\s*(?:[(]\s*(?:[<>]?=|<<|>>)\s*(?:${PKGVERSION_REGEX})\s*[)])?(\s*[^\|]+[]>]\s*)?$/) { my $sequence = $1; my $has_profile_or_arch_restriction = $2 ? 1 : 0; my $addon_type = $field2addon_type{$field}; -- cgit v1.2.3 From fe4f08e9f21e74b2d325be39a2d6c69d39952aae Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 19 Aug 2019 07:32:53 +0000 Subject: Revert "dh_builddeb: Remove support for --destdir" This reverts commit e91dbdba83aa60c0313fd68f92652f00d34c97b6. Not sure the usage makes sense to me, but for now we roll it until we can review the situation. --- debian/changelog | 3 +++ dh_builddeb | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0ee55e2b..ed9d541b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ debhelper (12.5.3) UNRELEASED; urgency=medium field in dh without breaking dh's own --list or --help parameter. This fixes a regression since 12.5 where dh's --help and --list options were broken. + * dh_builddeb: Revert removal of --destdir for now. It is in + fact used to hardcode paths in some cases e.g. v4l2loopback's + debian/rules.modules. -- Niels Thykier Sun, 18 Aug 2019 18:33:50 +0000 diff --git a/dh_builddeb b/dh_builddeb index 15d8ffd3..7d36fa3e 100755 --- a/dh_builddeb +++ b/dh_builddeb @@ -16,7 +16,7 @@ our $VERSION = DH_BUILTIN_VERSION; =head1 SYNOPSIS -B [S>] [B<--filename=>I] [S I>] +B [S>] [B<--destdir=>I] [B<--filename=>I] [S I>] =head1 DESCRIPTION @@ -35,6 +35,11 @@ L. =over 4 +=item B<--destdir=>I + +Use this if you want the generated F<.deb> files to be put in a directory +other than the default of "F<..>". + =item B<--filename=>I Use this if you want to force the generated .deb file to have a particular @@ -56,10 +61,13 @@ It is deprecated; use B<--> instead. init(options => { "filename=s" => \$dh{FILENAME}, + "destdir=s" => \$dh{DESTDIR}, }); # Set the default destination directory. -$dh{DESTDIR}='..'; +if (! defined $dh{DESTDIR}) { + $dh{DESTDIR}='..'; +} if (! defined $dh{FILENAME}) { $dh{FILENAME}=''; -- cgit v1.2.3 From 3ac9aac5b6245bb1990024dab2707db1f2903b1d Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 19 Aug 2019 07:49:09 +0000 Subject: dh_makeshlibs: Disable auto-filtering of libraries in udeb It cannot be implemented (at least not in this way) without breaking the noudeb profile and its requirements that deb packages are reproducible with and without the profile. Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_makeshlibs | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ed9d541b..4d106780 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ debhelper (12.5.3) UNRELEASED; urgency=medium * dh_builddeb: Revert removal of --destdir for now. It is in fact used to hardcode paths in some cases e.g. v4l2loopback's debian/rules.modules. + * dh_makeshlibs: Disable auto-filtering of udeb libraries. It + cannot be implemented without violating the requirements for + the noudeb build-profile. -- Niels Thykier Sun, 18 Aug 2019 18:33:50 +0000 diff --git a/dh_makeshlibs b/dh_makeshlibs index 87b46964..a588aea8 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -351,12 +351,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (! $seen{$line}) { $seen{$line}=1; push(@deb_lines, $line); - if (defined($udeb_name) && (defined($shlibs_udeb) or exists($known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"}))) { + if (defined($udeb_name)) { my $udeb_deps = $deps; $udeb_deps =~ s/\Q$package\E/$udeb_name/e; $line="udeb: $library $major $udeb_deps"; push @udeb_lines, $line; - delete($known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"}); + # Track which libraries have been used in the udeb to ensure + # we spot missing libraries. + delete($known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"}) + if defined($udeb_name); } } } -- cgit v1.2.3 From 4b8599e988a7ab222d3fe2ec47bd2103115c1989 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 19 Aug 2019 07:50:06 +0000 Subject: dh_makeshlibs: Avoid erroring out under the noudeb profile due to empty udebs Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_makeshlibs | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4d106780..d98ea52c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ debhelper (12.5.3) UNRELEASED; urgency=medium * dh_makeshlibs: Disable auto-filtering of udeb libraries. It cannot be implemented without violating the requirements for the noudeb build-profile. + * dh_makeshlibs: Fix invalid error under the noudeb profile + where the absence of udeb content is expected rather than an + in issue. (Closes: #934999) -- Niels Thykier Sun, 18 Aug 2019 18:33:50 +0000 diff --git a/dh_makeshlibs b/dh_makeshlibs index a588aea8..a6a404fc 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -288,17 +288,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $guessed_udeb = "${package}-udeb"; $udeb_name = $guessed_udeb if is_known_package($guessed_udeb) and is_udeb($guessed_udeb); } - if (defined($udeb_name)) { + # If there is a udeb (which we assume there never is under the "noudeb" build-profile) + # then check it for libraries. + if (defined($udeb_name) and not is_build_profile_active('noudeb')) { for my $so_data (_all_so_files($udeb_name, tmpdir($udeb_name))) { - my ($path, $library, $major) = @{$so_data}; + my (undef, $library, $major) = @{$so_data}; $known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"} = 1; } - # If the udeb contains no SO files, then we there - if (not exists($known_udeb_solibs{$udeb_name})) { - error("The udeb $shlibs_udeb does not contain any shared libraries but --add-udeb=$shlibs_udeb was passed!?") - if defined($shlibs_udeb); - $udeb_name = undef; - } + # If the udeb contains no SO files but there was an explicit --add-udeb, then + # something is wrong. + error("The udeb $shlibs_udeb does not contain any shared libraries but --add-udeb=$shlibs_udeb was passed!?") + if defined($shlibs_udeb) and not exists($known_udeb_solibs{$udeb_name}); } for my $so_data (_all_so_files($package, $tmp)) { my ($lib_file, $library, $major) = @{$so_data}; -- cgit v1.2.3 From f481a0a2def177820f1a05927606f316bb36fc14 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 19 Aug 2019 09:50:42 +0000 Subject: Release debhlper/12.5.3 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d98ea52c..7e47108c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.5.3) UNRELEASED; urgency=medium +debhelper (12.5.3) unstable; urgency=medium * Dh_Getopt.pm: Skip compat call if d/control cannot be found and just assume that auto-abbreviation can be disabled in that @@ -18,7 +18,7 @@ debhelper (12.5.3) UNRELEASED; urgency=medium where the absence of udeb content is expected rather than an in issue. (Closes: #934999) - -- Niels Thykier Sun, 18 Aug 2019 18:33:50 +0000 + -- Niels Thykier Mon, 19 Aug 2019 09:50:19 +0000 debhelper (12.5.2) unstable; urgency=medium -- cgit v1.2.3 From 80df1602a61bf92c57b09b8a4a26f116ba39e5f9 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Tue, 20 Aug 2019 14:17:28 +0000 Subject: dh_installxfonts: Remove unnecessary constraint in misc:Depends Signed-off-by: Niels Thykier --- debian/changelog | 8 ++++++++ dh_installxfonts | 10 ++-------- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7e47108c..a32b3bc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (12.5.4) UNRELEASED; urgency=medium + + * dh_installxfonts: Remove version in dependency on xfonts-utils + added to ${misc:Depends}. The version requirement has been + satisfied for the past 3-4 releases. + + -- Niels Thykier Tue, 20 Aug 2019 14:14:47 +0000 + debhelper (12.5.3) unstable; urgency=medium * Dh_Getopt.pm: Skip compat call if d/control cannot be found diff --git a/dh_installxfonts b/dh_installxfonts index 91887728..c16659f7 100755 --- a/dh_installxfonts +++ b/dh_installxfonts @@ -65,9 +65,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (@fontdirs) { # Figure out what commands the postinst and postrm will need # to call. - my @cmds; - my @cmds_postinst; - my @cmds_postrm; + my (@cmds, @cmds_postinst, @cmds_postrm); # Sort items for reproducible binary package contents. foreach my $f (sort @fontdirs) { # This must come before update-fonts-dir. @@ -85,11 +83,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { autoscript($package, "postrm", "postrm-xfonts", { 'CMDS' => join(";", @cmds, @cmds_postrm) }); - if (@cmds_postrm) { - addsubstvar($package, "misc:Depends", "xfonts-utils", ">= 1:7.5+2"); - } else { - addsubstvar($package, "misc:Depends", "xfonts-utils"); - } + addsubstvar($package, "misc:Depends", "xfonts-utils"); } } -- cgit v1.2.3 From 0ee2559c19196cb0a968d8e83eae438910163b96 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 1 Sep 2019 06:17:06 +0000 Subject: dh_makeshlibs: Disable control check with --add-udeb Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ dh_makeshlibs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a32b3bc4..0b4adc00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ debhelper (12.5.4) UNRELEASED; urgency=medium * dh_installxfonts: Remove version in dependency on xfonts-utils added to ${misc:Depends}. The version requirement has been satisfied for the past 3-4 releases. + * dh_makeshlibs: Correct a control check that was only intended + for automatic udeb detection, which incorrectly also checked + when --add-udeb was passed. Thanks to Andreas Metzler for + reporting the issue. (Closes: #935577) -- Niels Thykier Tue, 20 Aug 2019 14:14:47 +0000 diff --git a/dh_makeshlibs b/dh_makeshlibs index 9284b4c3..cc32e308 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -365,7 +365,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } } - if (defined($udeb_name)) { + if (defined($udeb_name) and not $shlibs_udeb) { my $issues = 0; for my $lib_key (sort(keys(%{$known_udeb_solibs{$udeb_name}}))) { my ($library, $major) = split(qr/\x1f/, $lib_key); -- cgit v1.2.3 From e2ba7772649b1036a1ae9b45e05b061013936a78 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 1 Sep 2019 06:50:17 +0000 Subject: dh: Fix bug in binary-indep in compat 5-12 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++++ dh | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0b4adc00..4a8ce522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ debhelper (12.5.4) UNRELEASED; urgency=medium for automatic udeb detection, which incorrectly also checked when --add-udeb was passed. Thanks to Andreas Metzler for reporting the issue. (Closes: #935577) + * dh: Fix bug where overrides for dh_dwz, dh_strip, dh_makeshlibs + or dh_shlibdeps could be triggered via binary-indep in compat + 12 and earlier. Thanks to Andreas Beckmann for reporting the + issue. (Closes: #935780) -- Niels Thykier Tue, 20 Aug 2019 14:14:47 +0000 diff --git a/dh b/dh index 79d48ca3..222dba7a 100755 --- a/dh +++ b/dh @@ -668,8 +668,10 @@ sub _compute_addons { push(@addon_requests, '+elf-tools'); } elsif (compat(12, 1)) { # In compat 12 and earlier, we only inject the sequence if there are arch - # packages present. - push(@addon_requests, '+elf-tools') if getpackages('arch'); + # packages present and the sequence requires it. + if (getpackages('arch') and $sequence_type ne SEQUENCE_TYPE_INDEP_ONLY) { + push(@addon_requests, '+elf-tools'); + } } else { # In compat 13, we always inject the addon if not explicitly requested and # then flag it as arch_only -- cgit v1.2.3 From 74935e7870d474c2a9ce51b5c29efbdb7d458a5e Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 1 Sep 2019 06:51:12 +0000 Subject: d/compat: Bump to compat level 13 Signed-off-by: Niels Thykier --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/compat b/debian/compat index 48082f72..b1bd38b6 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -12 +13 -- cgit v1.2.3 From 5473d86bf0b65c4624a32d784baec4e51c1a6f2a Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 1 Sep 2019 07:23:35 +0000 Subject: Release debhelper/12.5.4 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4a8ce522..8094f903 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.5.4) UNRELEASED; urgency=medium +debhelper (12.5.4) unstable; urgency=medium * dh_installxfonts: Remove version in dependency on xfonts-utils added to ${misc:Depends}. The version requirement has been @@ -12,7 +12,7 @@ debhelper (12.5.4) UNRELEASED; urgency=medium 12 and earlier. Thanks to Andreas Beckmann for reporting the issue. (Closes: #935780) - -- Niels Thykier Tue, 20 Aug 2019 14:14:47 +0000 + -- Niels Thykier Sun, 01 Sep 2019 07:23:05 +0000 debhelper (12.5.3) unstable; urgency=medium -- cgit v1.2.3 From fb2428df41d0c65c8357d6e0dd0ae679d467c994 Mon Sep 17 00:00:00 2001 From: Sven Joachim Date: Thu, 15 Aug 2019 19:24:27 +0200 Subject: Split off a libdebhelper-perl binary package This makes it possible for debhelper adddon packages to depend on it rather than on debhelper, breaking the circular dependencies between debhelper and dh-autoreconf/dh-strip-nondeterminism. The autoscripts are used by the autoscript routine in Dh_Lib.pm, so I decided to put those into libdebhelper-perl as well. Closes: #821130 --- debian/control | 15 +++++++++++++++ debian/debhelper.install | 1 + debian/libdebhelper-perl.install | 2 ++ debian/rules | 4 ++-- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 debian/debhelper.install create mode 100644 debian/libdebhelper-perl.install (limited to 'debian') diff --git a/debian/control b/debian/control index ea89ab96..656456df 100644 --- a/debian/control +++ b/debian/control @@ -31,6 +31,7 @@ Depends: autotools-dev, file (>= 3.23), libdpkg-perl (>= 1.17.14), man-db, + libdebhelper-perl (= ${source:Version}), po-debconf, ${misc:Depends}, ${perl:Depends} @@ -61,6 +62,20 @@ Description: helper programs for debian/rules menu system, debconf, doc-base, etc. Most Debian packages use debhelper as part of their build process. +Package: libdebhelper-perl +Section: perl +Architecture: all +Depends: ${misc:Depends}, + ${perl:Depends} +Replaces: debhelper (<< 12.6~) +Breaks: debhelper (<< 12.6~) +Multi-Arch: foreign +Description: debhelper perl modules + A collection of programs that can be used in a debian/rules file to + automate common tasks related to building Debian packages. + . + This package provides the perl modules used by the scripts in debhelper. + Package: dh-systemd Section: oldlibs Architecture: all diff --git a/debian/debhelper.install b/debian/debhelper.install new file mode 100644 index 00000000..e7724817 --- /dev/null +++ b/debian/debhelper.install @@ -0,0 +1 @@ +usr/bin diff --git a/debian/libdebhelper-perl.install b/debian/libdebhelper-perl.install new file mode 100644 index 00000000..0df575c9 --- /dev/null +++ b/debian/libdebhelper-perl.install @@ -0,0 +1,2 @@ +usr/share/debhelper +usr/share/perl5 diff --git a/debian/rules b/debian/rules index 756fe9c0..57454cd1 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ PERL ?= perl # builds without needing autotools-dev, dh-strip-nondetermism etc.) override_dh_update_autotools_config override_dh_strip_nondeterminism: -override_dh_auto_install: - ./run dh_auto_install --destdir=debian/debhelper +override_dh_install: + ./run dh_install PERLLIBDIR=$$($(PERL) -MConfig -e 'print $$Config{vendorlib}')/Debian/Debhelper ; \ $(PERL) -I"debian/debhelper/$${PERLLIBDIR}" debian/gen-provides > debian/debhelper.substvars -- cgit v1.2.3 From 545b4a367adc63b1cbc641aa09aeac76fd8b2007 Mon Sep 17 00:00:00 2001 From: Sven Joachim Date: Thu, 15 Aug 2019 19:46:51 +0200 Subject: d/rules: Use dh_missing's --fail-missing option With files split across multiple packages, it is easy to inadvertently miss one or several of them, so catch that mistake. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 57454cd1..2afb9275 100755 --- a/debian/rules +++ b/debian/rules @@ -22,3 +22,6 @@ override_dh_install: ./run dh_install PERLLIBDIR=$$($(PERL) -MConfig -e 'print $$Config{vendorlib}')/Debian/Debhelper ; \ $(PERL) -I"debian/debhelper/$${PERLLIBDIR}" debian/gen-provides > debian/debhelper.substvars + +override_dh_missing: + ./run dh_missing --fail-missing -- cgit v1.2.3 From db0cea3e844b1ccfcf2e81a7c7ad0741ba8b5faa Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 8 Sep 2019 06:06:41 +0000 Subject: changelog: Document Sven's changes Signed-off-by: Niels Thykier --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8094f903..0c3a0578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +debhelper (12.6) UNRELEASED; urgency=medium + + [ Sven Joachim ] + * Split debhelper into debhelper (the tools) and libdebhelper-perl + (the Perl libraries). (Closes: #821130) + * d/rules: Call dh_missing --fail-missing to catch bugs where files + are not installed anywhere. + + -- Niels Thykier Sun, 08 Sep 2019 05:59:42 +0000 + debhelper (12.5.4) unstable; urgency=medium * dh_installxfonts: Remove version in dependency on xfonts-utils -- cgit v1.2.3 From 6d66f6c0000b2885313e643593eeb85d0e9860da Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 8 Sep 2019 06:13:33 +0000 Subject: dh_makeshlibs: Fix regression with automatic udeb detection Signed-off-by: Niels Thykier --- debian/changelog | 6 ++++++ dh_makeshlibs | 2 ++ 2 files changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0c3a0578..11f284e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ debhelper (12.6) UNRELEASED; urgency=medium + [ Niels Thykier ] + * dh_makeshlibs: Fix regression where versionless SONAMEs could + trigger a rejection of the "generated" shlibs file (despite + dh_makeshlibs not generating any "shlibs" files). + (Closes: #939635) + [ Sven Joachim ] * Split debhelper into debhelper (the tools) and libdebhelper-perl (the Perl libraries). (Closes: #821130) diff --git a/dh_makeshlibs b/dh_makeshlibs index cc32e308..33ed26b1 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -293,6 +293,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (defined($udeb_name) and not is_build_profile_active('noudeb')) { for my $so_data (_all_so_files($udeb_name, tmpdir($udeb_name))) { my (undef, $library, $major) = @{$so_data}; + $major = $dh{M_PARAMS} if defined($dh{M_PARAMS}) and $dh{M_PARAMS} ne ''; + next if not defined($library) or not defined($major); $known_udeb_solibs{$udeb_name}{"${library}\x1f${major}"} = 1; } # If the udeb contains no SO files but there was an explicit --add-udeb, then -- cgit v1.2.3 From 75639d0f64005ca72d84b8378ce24fe3ea1818ce Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 8 Sep 2019 13:22:04 +0000 Subject: dh_strip: Avoid impossible copy manual dbg pkgs + dh_dwz Signed-off-by: Niels Thykier --- debian/changelog | 3 +++ dh_strip | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 11f284e4..53079f76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ debhelper (12.6) UNRELEASED; urgency=medium trigger a rejection of the "generated" shlibs file (despite dh_makeshlibs not generating any "shlibs" files). (Closes: #939635) + * dh_strip: Avoid impossible copy of .../debug/.dwz/ to itself + when a manual debug package contained ELF files and was + processed by dh_dwz before dh_strip. (Closes: #939164) [ Sven Joachim ] * Split debhelper into debhelper (the tools) and libdebhelper-perl diff --git a/dh_strip b/dh_strip index ab876360..d7bf2399 100755 --- a/dh_strip +++ b/dh_strip @@ -379,7 +379,7 @@ sub process_packages { doit($strip, '--strip-debug', '--remove-section=.comment', '--remove-section=.note', '--enable-deterministic-archives', $_); } - if (-d "$tmp/usr/lib/debug/.dwz" and ($use_build_id > 1 or $dh{DEBUGPACKAGE})) { + if (-d "$tmp/usr/lib/debug/.dwz" and ($use_build_id > 1 or ($dh{DEBUGPACKAGE} and $dh{DEBUGPACKAGE} ne $package))) { my @files = glob_expand(["$tmp/usr/lib/debug/.dwz"], \&glob_expand_error_handler_reject, '*'); install_dir("$debugtmp/usr/lib/debug/.dwz"); xargs(\@files, 'cp', '--reflink=auto', "-a", XARGS_INSERT_PARAMS_HERE, "$debugtmp/usr/lib/debug/.dwz"); -- cgit v1.2.3 From 47b9ab2423ca278e614231d550a86bbf7265f1c0 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 14 Sep 2019 06:40:13 +0000 Subject: Release debhelper/12.6 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 53079f76..ea98e15d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.6) UNRELEASED; urgency=medium +debhelper (12.6) experimental; urgency=medium [ Niels Thykier ] * dh_makeshlibs: Fix regression where versionless SONAMEs could @@ -15,7 +15,7 @@ debhelper (12.6) UNRELEASED; urgency=medium * d/rules: Call dh_missing --fail-missing to catch bugs where files are not installed anywhere. - -- Niels Thykier Sun, 08 Sep 2019 05:59:42 +0000 + -- Niels Thykier Sat, 14 Sep 2019 06:37:44 +0000 debhelper (12.5.4) unstable; urgency=medium -- cgit v1.2.3 From a44e83f79d0b642c70f997df07ef65b5f4e3f7a3 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 15 Sep 2019 10:09:31 +0000 Subject: Release debhelper/12.6.1 Signed-off-by: Niels Thykier --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ea98e15d..a016fd28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (12.6.1) unstable; urgency=medium + + * Upload to unstable now that libdebhelper-perl has been through + the NEW queue. + + -- Niels Thykier Sun, 15 Sep 2019 10:08:53 +0000 + debhelper (12.6) experimental; urgency=medium [ Niels Thykier ] -- cgit v1.2.3 From 92c016db6b82b36aca270ca2a269859e7a17f2cb Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 28 Sep 2019 19:10:28 +0000 Subject: wrong CMAKE_SYSTEM_PROCESSOR for 32bit arms Signed-off-by: Niels Thykier --- debian/changelog | 8 ++++++++ lib/Debian/Debhelper/Buildsystem/cmake.pm | 1 + 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a016fd28..0e2fe896 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (12.6.2) UNRELEASED; urgency=medium + + [ Helmut Grohne ]: + * cmake buildsystem: Fix CMAKE_SYSTEM_PROCESSOR for 32bit arms. + (Closes: #941245) + + -- Helmut Grohne Fri, 27 Sep 2019 06:12:45 +0200 + debhelper (12.6.1) unstable; urgency=medium * Upload to unstable now that libdebhelper-perl has been through diff --git a/lib/Debian/Debhelper/Buildsystem/cmake.pm b/lib/Debian/Debhelper/Buildsystem/cmake.pm index 1d5bd1a9..b1562286 100644 --- a/lib/Debian/Debhelper/Buildsystem/cmake.pm +++ b/lib/Debian/Debhelper/Buildsystem/cmake.pm @@ -27,6 +27,7 @@ my %DEB_HOST2CMAKE_SYSTEM = ( ); my %GNU_CPU2SYSTEM_PROCESSOR = ( + 'arm' => 'armv7l', 'mips64el' => 'mips64', 'powerpc64le' => 'ppc64le', ); -- cgit v1.2.3 From 488e6310d5c512b12079f4b353c039deefca3dea Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 29 Sep 2019 20:34:47 +0000 Subject: dh_installman: Avoid error messages when man-db is not present Signed-off-by: Niels Thykier --- debian/changelog | 5 +++++ dh_installman | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0e2fe896..d6806f4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ debhelper (12.6.2) UNRELEASED; urgency=medium + [ Niels Thykier ]: + * dh_installman: Avoid error message when man-db is not unstalled + (only occurs in debhelper's own buid as man-db is a mandatory + dependency). + [ Helmut Grohne ]: * cmake buildsystem: Fix CMAKE_SYSTEM_PROCESSOR for 32bit arms. (Closes: #941245) diff --git a/dh_installman b/dh_installman index f8de7ace..55a13fa5 100755 --- a/dh_installman +++ b/dh_installman @@ -272,7 +272,7 @@ on_items_in_parallel(\@all_packages, sub { }); # Now utf-8 conversion. -if (defined(`man --version`)) { +if (has_man_db_tool('man')) { my (@manpages_to_reencode, @issues); for my $package (@{$dh{DOPACKAGES}}) { next if is_udeb($package); @@ -359,6 +359,17 @@ sub find_so_man { } } +sub has_man_db_tool { + my ($tool) = @_; + open(my $old_stderr, '>&', *STDERR) or error("dup(STDERR, tmp_fd): $!"); + open(*STDERR, '>', '/dev/null') or error("re-open stderr as /dev/null: $!"); + + my $res = defined(`$tool --version`); + open(*STDERR, '>&', $old_stderr) or error("dup(tmp_fd, STDERR): $!"); + close($old_stderr); + return $res; +} + =head1 SEE ALSO L -- cgit v1.2.3 From c07134c6a844e9b5cc3a44748ba35fa6916cff9d Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 29 Sep 2019 20:48:48 +0000 Subject: dh_installman: Use man-recode(1) when present It is a lot faster for any package with a non-trivial amount of manpages- Signed-off-by: Niels Thykier --- debian/changelog | 5 +++++ dh_installman | 37 ++++++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d6806f4c..51edd7e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ debhelper (12.6.2) UNRELEASED; urgency=medium * dh_installman: Avoid error message when man-db is not unstalled (only occurs in debhelper's own buid as man-db is a mandatory dependency). + * dh_installman: Use man-recode(1) when available to massively + speed up re-encoding performance for any package with a non- + trivial amount of manpages. Thanks to Robert Luberda for + reporting the issue and Colin Watson for writing man-recode + (Closes: #933576) [ Helmut Grohne ]: * cmake buildsystem: Fix CMAKE_SYSTEM_PROCESSOR for 32bit arms. diff --git a/dh_installman b/dh_installman index 55a13fa5..461764d0 100755 --- a/dh_installman +++ b/dh_installman @@ -272,6 +272,9 @@ on_items_in_parallel(\@all_packages, sub { }); # Now utf-8 conversion. +my $has_man_recode = 0; +$has_man_recode = 1 if has_man_db_tool('man-recode'); + if (has_man_db_tool('man')) { my (@manpages_to_reencode, @issues); for my $package (@{$dh{DOPACKAGES}}) { @@ -296,19 +299,7 @@ if (has_man_db_tool('man')) { } } if (@manpages_to_reencode) { - on_items_in_parallel(\@manpages_to_reencode, sub { - for my $manpage (@_) { - my $manpage_tmp = "${manpage}.dh-new"; - my $manpage_cmd = ($manpage =~ m{^/}) ? $manpage : "./${manpage}"; - doit({ stdout => $manpage_tmp }, 'man', '-l', '--recode', 'UTF-8', $manpage_cmd); - # recode uncompresses compressed pages - my $orig = $manpage; - rm_files($orig) if $manpage =~ s/\.(gz|Z)$//; - rename_path($manpage_tmp, $manpage); - } - # Bulk reset permissions of all re-encoded files - xargs(\@_, 'chmod', '0644', '--'); - }); + on_items_in_parallel(\@manpages_to_reencode, \&reencode_manpages); } } else { # Should only occur during debhelper building itself (to avoid a B-D on man-db). @@ -370,6 +361,26 @@ sub has_man_db_tool { return $res; } +sub reencode_manpages { + my (@manpages) = @_; + if ($has_man_recode) { + xargs(\@manpages, 'man-recode', '--to-code', 'UTF-8', '--suffix', '.dh-new'); + } + for my $manpage (@manpages) { + my $manpage_tmp = "${manpage}.dh-new"; + if (not $has_man_recode) { + my $manpage_cmd = ($manpage =~ m{^/}) ? $manpage : "./${manpage}"; + doit({ stdout => $manpage_tmp }, 'man', '-l', '--recode', 'UTF-8', $manpage_cmd); + } + # recode uncompresses compressed pages + my $orig = $manpage; + rm_files($orig) if $manpage =~ s/\.(gz|Z)$//; + rename_path($manpage_tmp, $manpage); + } + # Bulk reset permissions of all re-encoded files + xargs(\@manpages, 'chmod', '0644', '--'); +} + =head1 SEE ALSO L -- cgit v1.2.3 From ebc4f4e86db129b584a88134cf2bca217435d0e3 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 6 Oct 2019 10:01:49 +0000 Subject: Actively discourage (but no deprecate) c11 Signed-off-by: Niels Thykier --- debhelper.pod | 8 ++++++++ debian/changelog | 4 ++++ 2 files changed, 12 insertions(+) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index 8ef49ce6..dcc314d9 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -645,6 +645,14 @@ those ~5 years, this item have been removed rather than fixed. =item v11 +This mode is discouraged. + +The compat 11 is discouraged for new packages as it suffers from +feature interaction between L and L +causing services to not run correctly in some cases. Please consider +using compatibility mode 10 or 12 instead. More details about the +issue are available in Debian#887904. + Changes from v10 are: =over 8 diff --git a/debian/changelog b/debian/changelog index 51edd7e2..c5759294 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ debhelper (12.6.2) UNRELEASED; urgency=medium trivial amount of manpages. Thanks to Robert Luberda for reporting the issue and Colin Watson for writing man-recode (Closes: #933576) + * debhelper.pod: Actively discourage compat 11 as it has an + issue that causes services not to start correctly in all cases + (e.g. install, remove-but-not-purge, install again), which + cannot be fixed. [ Helmut Grohne ]: * cmake buildsystem: Fix CMAKE_SYSTEM_PROCESSOR for 32bit arms. -- cgit v1.2.3 From 86f001d464d4e0eb6e57ebc6a0c79dd83e410609 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 12 Oct 2019 12:18:54 +0000 Subject: dh_auto_*: Support reload-all-buildenv-variables Signed-off-by: Niels Thykier --- debhelper.pod | 31 +++++++++++++++++++++++++++++++ debian/changelog | 6 +++++- lib/Debian/Debhelper/Dh_Buildsystems.pm | 8 ++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debhelper.pod b/debhelper.pod index 74ab9650..e850ef5c 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -301,6 +301,37 @@ level that is known to work, or that you wish to support. Notably, setting the maximum to 1 is effectively the same as using B<--no-parallel>. +=item B<--reload-all-buildenv-variables> + +By default, L will compute several environment (e.g. by using +L) and cache them to avoid having all B +tool recompute them. + +When passing this option, the concrete B tool will ignore +the cache from L and retrigger a rebuild of these variables. +This is useful in the very rare case where the package need to do +multiple builds but with different B<...FLAGS> options. A concrete +example would be needing to change the B<-O> parameter in B in +the second build: + + export DEB_CFLAGS_MAINT_APPEND=-O3 + + %: + dh $@ + + override_dh_auto_configure: + dh_auto_configure -Bbuild-deb ... + DEB_CFLAGS_MAINT_APPEND=-Os dh_auto_configure \ + --reload-all-buildenv-variables -Bbuild-udeb ... + +Without B<--reload-all-buildenv-variables> in the second call to +L, the change in B +would be ignored as L would use the cached value +of B set by L. + +This option is only available with B<< debhelper (>= 12.7~) >> when +the package uses compatibility level 9 or later. + =item B<--list>, B<-l> List all build systems supported by debhelper on this system. The list diff --git a/debian/changelog b/debian/changelog index c5759294..1e2e970f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.6.2) UNRELEASED; urgency=medium +debhelper (12.7) UNRELEASED; urgency=medium [ Niels Thykier ]: * dh_installman: Avoid error message when man-db is not unstalled @@ -13,6 +13,10 @@ debhelper (12.6.2) UNRELEASED; urgency=medium issue that causes services not to start correctly in all cases (e.g. install, remove-but-not-purge, install again), which cannot be fixed. + * dh_auto_*: Support a new --reload-all-buildenv-variables + option for resetting the cache (of e.g. dpkg-buildflags). + This is needed by e.g. parted which does two builds with + different CFLAGS. [ Helmut Grohne ]: * cmake buildsystem: Fix CMAKE_SYSTEM_PROCESSOR for 32bit arms. diff --git a/lib/Debian/Debhelper/Dh_Buildsystems.pm b/lib/Debian/Debhelper/Dh_Buildsystems.pm index d0e69d8c..715c7089 100644 --- a/lib/Debian/Debhelper/Dh_Buildsystems.pm +++ b/lib/Debian/Debhelper/Dh_Buildsystems.pm @@ -201,7 +201,15 @@ sub buildsystems_init { "parallel" => sub { $max_parallel = -1 }, 'no-parallel' => sub { $max_parallel = 1 }, "max-parallel=i" => \$max_parallel, + + 'reload-all-buildenv-variables' => sub { delete($ENV{'DH_INTERNAL_BUILDFLAGS'}); }, ); + if (compat(8)) { + # This option only works in compat 9+ where we actually set buildflags + $options{'reload-all-buildenv-variables'} = sub { + die("--reload-all-buildenv-variables only work reliably in compat 9+"); + }; + } $args{options}{$_} = $options{$_} foreach keys(%options); Debian::Debhelper::Dh_Lib::init(%args); Debian::Debhelper::Dh_Lib::set_buildflags(); -- cgit v1.2.3 From 52ee21d763e3bd1d6adc2a6183fcf9510151a80d Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Wed, 16 Oct 2019 19:52:50 +0000 Subject: dh_makeshlibs: Suggest --no-add-udeb for some cases Signed-off-by: Niels Thykier --- debian/changelog | 5 +++++ dh_makeshlibs | 7 +++++++ 2 files changed, 12 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1e2e970f..5236d975 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,11 @@ debhelper (12.7) UNRELEASED; urgency=medium option for resetting the cache (of e.g. dpkg-buildflags). This is needed by e.g. parted which does two builds with different CFLAGS. + * dh_makeshlibs: Suggest/Document that --no-add-udeb can be + relevant for some udebs where the shared library for the udeb + is embedded in a different package (e.g. the main udeb + package). Thanks to Nicolas Braud-Santoni for reporting the + issue. (Closes: #942454) [ Helmut Grohne ]: * cmake buildsystem: Fix CMAKE_SYSTEM_PROCESSOR for 32bit arms. diff --git a/dh_makeshlibs b/dh_makeshlibs index 33ed26b1..5ccfac07 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -171,6 +171,11 @@ contains libraries B present in the deb package. Do not add any udeb lines to the shlibs file. This can be used to disable the default auto-detection of udebs. +This may be useful in case you do not want a shlibs file at all for the udeb +because no package will depend on it. E.g. because adding a udeb package +for the library was "overkill" and the library is embedded in a different +udeb package. + =item B<--> I Pass I to L. @@ -380,6 +385,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { warning("Hint: Either add the missing libraries to $package, remove them from $udeb_name, or"); warning("Hint: (if this difference is expected) pass \"--add-udeb=$udeb_name\" to dh_makeshlibs."); warning("Hint: In the latter case, you *may* also need to combine it with \"-p$package\""); + warning("Hint: Alternatively, if you have merged the shared lib package into $udeb_name and it has no"); + warning("Hint: other packages need to know of this library, then use \"--no-add-udeb\""); } } -- cgit v1.2.3 From 4216cdede7e6bc10ddb155bb1204e6ae50fde6ce Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Tue, 15 Oct 2019 14:57:50 +0100 Subject: Update changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5236d975..528858e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,12 @@ debhelper (12.7) UNRELEASED; urgency=medium * cmake buildsystem: Fix CMAKE_SYSTEM_PROCESSOR for 32bit arms. (Closes: #941245) + [ Niko Tyni ] + * Basic support cross building XS modules: + + perl_makemaker: run Makefile.PL with host arch Config.pm + + perl_build: run Build.PL and Build with host arch Config.pm + + dh_perl: scan host arch include directories for Perl plugins + -- Helmut Grohne Fri, 27 Sep 2019 06:12:45 +0200 debhelper (12.6.1) unstable; urgency=medium -- cgit v1.2.3 From 2d5eddd2922af8222c243cb3b07dd6226e15ced4 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 19 Oct 2019 10:02:20 +0000 Subject: d/changelog: Fix typos Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 528858e9..906875b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ debhelper (12.7) UNRELEASED; urgency=medium [ Niels Thykier ]: - * dh_installman: Avoid error message when man-db is not unstalled - (only occurs in debhelper's own buid as man-db is a mandatory + * dh_installman: Avoid error message when man-db is not installed + (only occurs in debhelper's own build as man-db is a mandatory dependency). * dh_installman: Use man-recode(1) when available to massively speed up re-encoding performance for any package with a non- -- cgit v1.2.3 From 3fb30816fc75076ba532f31dae5bcf67125c89fb Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 20 Oct 2019 05:07:39 +0000 Subject: meson.pm: Fix broken call to NAME Signed-off-by: Niels Thykier --- debian/changelog | 2 ++ lib/Debian/Debhelper/Buildsystem/meson.pm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 906875b8..c0b9ebb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ debhelper (12.7) UNRELEASED; urgency=medium is embedded in a different package (e.g. the main udeb package). Thanks to Nicolas Braud-Santoni for reporting the issue. (Closes: #942454) + * meson.pm: Fix invalid call under compat 13. Thanks to + Jeremy Bicha for testing it. (Closes: #942690) [ Helmut Grohne ]: * cmake buildsystem: Fix CMAKE_SYSTEM_PROCESSOR for 32bit arms. diff --git a/lib/Debian/Debhelper/Buildsystem/meson.pm b/lib/Debian/Debhelper/Buildsystem/meson.pm index e18d1112..842991e9 100644 --- a/lib/Debian/Debhelper/Buildsystem/meson.pm +++ b/lib/Debian/Debhelper/Buildsystem/meson.pm @@ -109,7 +109,7 @@ sub test { my $target = $this->get_targetbuildsystem; eval { - if (compat(12) or $target->name ne 'ninja') { + if (compat(12) or $target->NAME ne 'ninja') { $target->test(@_); } else { # In compat 13 with meson+ninja, we prefer using "meson test" @@ -118,7 +118,7 @@ sub test { update_env => { 'LC_ALL' => 'C.UTF-8', } - ); + ); if ($this->get_parallel() > 0) { $options{update_env}{MESON_TESTTHREADS} = $this->get_parallel(); } -- cgit v1.2.3 From 8ef91ab5ac04c3856539556cc4623de37bba8002 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sun, 20 Oct 2019 17:50:07 +0000 Subject: Release debhelper/12.7 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c0b9ebb6..cb6f0cd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debhelper (12.7) UNRELEASED; urgency=medium +debhelper (12.7) unstable; urgency=medium [ Niels Thykier ]: * dh_installman: Avoid error message when man-db is not installed @@ -35,7 +35,7 @@ debhelper (12.7) UNRELEASED; urgency=medium + perl_build: run Build.PL and Build with host arch Config.pm + dh_perl: scan host arch include directories for Perl plugins - -- Helmut Grohne Fri, 27 Sep 2019 06:12:45 +0200 + -- Niels Thykier Sun, 20 Oct 2019 17:48:06 +0000 debhelper (12.6.1) unstable; urgency=medium -- cgit v1.2.3 From a09af697f1e8981beb08bb54addd2914173330c6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 24 Oct 2019 19:18:55 +0000 Subject: dh_installman: Correctly handle compressed manpages w. man-recode Signed-off-by: Niels Thykier --- debian/changelog | 8 ++++++++ dh_installman | 1 + 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cb6f0cd9..8c4c3093 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (12.7.1) UNRELEASED; urgency=medium + + [ Colin Watson ] + * dh_installman: Correctly handle compressed manpages when + dh_installman uses man-recode. (Closes: #943376) + + -- Niels Thykier Thu, 24 Oct 2019 19:17:40 +0000 + debhelper (12.7) unstable; urgency=medium [ Niels Thykier ]: diff --git a/dh_installman b/dh_installman index 0ec9996e..3a5b5c68 100755 --- a/dh_installman +++ b/dh_installman @@ -368,6 +368,7 @@ sub reencode_manpages { } for my $manpage (@manpages) { my $manpage_tmp = "${manpage}.dh-new"; + $manpage_tmp =~ s/\.(gz|Z)\.dh-new$/.dh-new/; if (not $has_man_recode) { my $manpage_cmd = ($manpage =~ m{^/}) ? $manpage : "./${manpage}"; doit({ stdout => $manpage_tmp }, 'man', '-l', '--recode', 'UTF-8', $manpage_cmd); -- cgit v1.2.3 From 1f7b871e13ba716b32f956fdf3b8deb8389a0565 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 26 Oct 2019 06:15:11 +0000 Subject: Skip dh_installman test by default as it requires extra dependencies Signed-off-by: Niels Thykier --- .gitlab-ci.yml | 8 ++++++++ debian/control | 2 ++ t/dh_installman/01-basics.t | 17 ++++++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cfecfe10..713ae1ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,14 @@ tests-testing: - apt-get build-dep -y . - dpkg-buildpackage -us -uc -tc +tests-unstable-all: + stage: test + image: debian:unstable + script: + - apt-get update + - apt-get build-dep -y -Ppkg.debhelper.ci . + - dpkg-buildpackage -us -uc -tc + tests-unstable: stage: test image: debian:unstable diff --git a/debian/control b/debian/control index 656456df..e2574f68 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,8 @@ Uploaders: Niels Thykier , Build-Depends: dpkg-dev (>= 1.18.0~), perl:any, po4a, + man-db , + libtest-pod-perl , Rules-Requires-Root: no Standards-Version: 4.4.0 Testsuite: autopkgtest-pkg-perl diff --git a/t/dh_installman/01-basics.t b/t/dh_installman/01-basics.t index de7293d7..6e90cc94 100755 --- a/t/dh_installman/01-basics.t +++ b/t/dh_installman/01-basics.t @@ -9,7 +9,22 @@ use Test::DH; use File::Path qw(remove_tree make_path); use Debian::Debhelper::Dh_Lib qw(!dirname); -plan(tests => 2); +sub has_man_db_tool { + my ($tool) = @_; + open(my $old_stderr, '>&', *STDERR) or error("dup(STDERR, tmp_fd): $!"); + open(*STDERR, '>', '/dev/null') or error("re-open stderr as /dev/null: $!"); + + my $res = defined(`$tool --version`); + open(*STDERR, '>&', $old_stderr) or error("dup(tmp_fd, STDERR): $!"); + close($old_stderr); + return $res; +} + +if (has_man_db_tool('man') || has_man_db_tool('man-recode')) { + plan(tests => 2); +} else { + plan(skip_all => 'Test requires man or man-recode'); +} our @TEST_DH_EXTRA_TEMPLATE_FILES = (qw( manpage-uncompressed.pod -- cgit v1.2.3 From f5f66df0f27ddc742ad2ae4a63799c709273b2f3 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Sat, 26 Oct 2019 06:42:20 +0000 Subject: Release debhelper/12.7.1 Signed-off-by: Niels Thykier --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8c4c3093..88563ca0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -debhelper (12.7.1) UNRELEASED; urgency=medium +debhelper (12.7.1) unstable; urgency=medium [ Colin Watson ] * dh_installman: Correctly handle compressed manpages when dh_installman uses man-recode. (Closes: #943376) - -- Niels Thykier Thu, 24 Oct 2019 19:17:40 +0000 + -- Niels Thykier Sat, 26 Oct 2019 06:42:04 +0000 debhelper (12.7) unstable; urgency=medium -- cgit v1.2.3