diff -Nru debhelper-13.1/debhelper.pod debhelper-13.2/debhelper.pod --- debhelper-13.1/debhelper.pod 2020-05-17 22:46:47.000000000 +0000 +++ debhelper-13.2/debhelper.pod 2020-07-06 04:46:49.000000000 +0000 @@ -28,8 +28,8 @@ automates the process. For a more gentle introduction, the B Debian package contains a tutorial about making your first package using debhelper. -Except where tool explicitly denotes otherwise, all of the debhelper -tools assumes that they run from root directory of an unpacked source +Except where the tool explicitly denotes otherwise, all of the debhelper +tools assume that they run from the root directory of an unpacked source package. This is so they can locate find files like F when needed. @@ -104,8 +104,63 @@ =head2 Substitutions in debhelper config files In compatibility level 13 and later, it is possible to use simple -substitutions in I debhelper config files (particularly, -the configuration files for L). +substitutions in debhelper config files for the following tools: + +=over 4 + +=item * + +dh_clean + +=item * + +dh_install + +=item * + +dh_installcatalogs + +=item * + +dh_installdeb + +=item * + +dh_installdirs + +=item * + +dh_installdocs + +=item * + +dh_installexamples + +=item * + +dh_installinfo + +=item * + +dh_installman + +=item * + +dh_installwm + +=item * + +dh_link + +=item * + +dh_missing + +=item * + +dh_ucf + +=back All substitution variables are of the form I<${foo}> and the braces are mandatory. Variable names are case-sensitive and consist of @@ -328,6 +383,12 @@ I rather than the top level directory of the Debian source package tree. +B: The B<--sourcedir> variant matches a similar named option in +B and B (etc.) for historical reasons. While they +have a similar name, they have very distinct purposes and in some cases +it can cause errors when this variant is passed to B (when then passes +it on to all tools). + =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 @@ -1088,9 +1149,10 @@ =item - The B helpers now resets the environment variables B -and common B variable. B and B are each -set to a distinct writable directory. The rest of the environment -variables are cleared. +and common B variable. Please see description of the +environment variables in L for how this handled. + +I =item - @@ -1162,6 +1224,26 @@ This compatibility level is still open for development; use with caution. +Changes from v13 are: + +=over 8 + +=item - + +The B buildsystem now passes B<-DCMAKE_SKIP_RPATH=ON> +and B<-DBUILD_RPATH_USE_ORIGIN=ON> to L to avoid some reproducibility +issues. + +This can cause issues with running binaries directly from the build directories +as they might now require a manually set B. If you need to +override this change, we recommend that you try to pass the +B<-DCMAKE_SKIP_RPATH=OFF> option first to see if that fixes the problem (leaving +B at its new default). This should undo the need for +B and avoid the reproducibility issues on Linux, where B<$ORIGIN> +is supported by the runtime linkers. + +=back + =back =head1 NOTES @@ -1300,11 +1382,13 @@ =head1 ENVIRONMENT -The following environment variables can influence the behavior of debhelper. +This section describes some of the environment variables that influences +the behaviour of debhelper or which debhelper interacts with. + It is important to note that these must be actual environment variables in -order to function properly (not simply F variables). To specify -them properly in F, be sure to "B" them. For example, -"B". +order to affect the behaviour of debhelper (not simply F variables). +To specify them properly in F, be sure to "B" them. For +example, "B". =over 4 @@ -1405,15 +1489,130 @@ In compat 13 and later, these environment variables are reset before invoking the upstream build system via the B helpers. The variables B -and B will be set to a writable directory. The remaining -variables will be cleared. +(all B helpers)and B (B only) will +be set to a writable directory. All remaining variables and B +(except for during B) will be cleared. + +The B directory will be created as an empty directory but it will be +reused between calls to B. Any content will persist until +explicitly deleted or B. + +=item B + +Please see L for this environment +variable. + +Please note that this variable should I be altered by package maintainers +inside F to change the behaviour of debhelper. Instead, where +the package maintainer need these features, they should look disabling the +relevant feature directly (e.g. by overriding the concrete tools). + +=item B + +This is a dpkg specific environment variable (see e.g. L). +The debhelper tool suite silently ignores it. -The directories will be created as empty directories but they will be reused -between calls to B. Any content will persist until explicitly -deleted or B. +It is documented here because it has a similar name to B, +which make some people mistakenly assume that debhelper will also react to this +variable. =back +=head2 Supported flags in DEB_BUILD_OPTIONS + +The debhelper tool suite reacts to the following flags in B. + +=over 4 + +=item B + +I + +When B is present and set to B, then +debhelper tools will promote deprecation warnings for usage of old soon +to be removed compat levels into errors. + +This is useful for automated checking for code relying on deprecated +compat levels that is scheduled for removal. + +This environment variable is intended for testing purposes; not +production builds. + +=item B + +I + +This value will cause the official debhelper tools will skip actions and +helpers that either remove, detach or deduplicate debugging symbols in +ELF binaries. + +This value affects L and L. + +=item B + +This value will cause the official debhelper build systems to skip runs +of upstream test suites. + +Package maintainers looking to avoid running the upstream tests should +B rely on this. Instead, they can add an empty override target +to skip B. + +This value affects L. + +=item B + +I + +This value will cause several debhelper tools to skip installation of +documentation such as manpages or upstream provided documentation. +Additionally, the tools will also ignore if declared documentation is +"missing" on the assumption that the documentation has not been built. + +This value effects tools I L, which I +it is working with documentation. + +=item B, B + +I + +This value causes debhelper to skip the generation of automatically +generated debug symbol packages. + +This value affects L. + +=item B + +This value enables debhelper to use up to B threads or processes +(subject to parameters like B<--no-parallel> and B<--max-parallel=M>). +Not all debhelper tools work with parallel tasks and may silently +ignore the request. + +This value affects many debhelper tools. Most notably B, +which will attempt to run the underlying upstream build system with +that number of threads. + +=item B + +This value will cause the official debhelper build systems to configure +upstream builds to be terse (i.e. reduce verbosity in their output). +This is subject to the upstream and the debhelper build system +supporting such features. + +This value affects most B tools. + +=back + +Unknown flags are silently ignored. + +Note third-party debhelper-like tools or third-party provided build systems +may or may not react to the above flags. This tends to depend on +implementation details of the tool. + =head1 SEE ALSO =over 4 diff -Nru debhelper-13.1/debian/changelog debhelper-13.2/debian/changelog --- debhelper-13.1/debian/changelog 2020-05-17 22:46:48.000000000 +0000 +++ debhelper-13.2/debian/changelog 2020-07-06 04:46:49.000000000 +0000 @@ -1,8 +1,42 @@ -debhelper (13.1-0~202005172228~ubuntu19.10.1) eoan; urgency=low +debhelper (13.2-0~202007060428~ubuntu19.10.1) eoan; urgency=low * Auto build. - -- MOZGIII Sun, 17 May 2020 22:46:48 +0000 + -- MOZGIII Mon, 06 Jul 2020 04:46:49 +0000 + +debhelper (13.2) unstable; urgency=medium + + [ Niels Thykier ] + * dh_missing: Explicitly remind people that they should not + copy-waste multi-arch paths directly into debian/not-installed. + Instead, recommend the use of wildcards of ${DEB_HOST_MULTIARCH} + to replace the hardcoded value. + * d/changelog: Clarify what dh_installman change in 13.1 related to + #958343 was about. + * Dh_Lib.pm: Add support for raising compat deprecation warnings to + an error if there are pending removals. This currently triggers + for usage of compat 5 and 6. + * cmake.pm: Pass -DCMAKE_SKIP_RPATH=ON -DBUILD_RPATH_USE_ORIGIN=ON + to cmake in compat 14. This should fix some reproducibility + issues but may cause breakage if packages run binaries directly + from the build directory. Thanks to Timo Röhling for the + suggestion. (Closes: #962474) + * dh,dh_auto_*: Change the handling of XDG_RUNTIME_DIR in compat 13. + It is now only set to a writable directory for dh_auto_test but + set to a much shorter directory avoid issues with socket lengths. + In all other cases, the XDG_RUNTIME_DIR is now cleared. Thanks to + Simon McVittie for the report. (Closes: #961655) + * debhelper.pod: Document that --sourcedir clashes between dh_auto_* + and dh_missing (etc.). Thanks to Thorsten Glaser for reporting + the issue. (See #964230) + + [ Anel Husakovic ] + * debhelper.7: Fix typo/grammatical errors. + + [ Translations ] + * Update Portuguese translation (Américo Monteiro) (Closes: #962568) + + -- Niels Thykier Sun, 05 Jul 2020 21:14:04 +0000 debhelper (13.1) unstable; urgency=low @@ -14,9 +48,12 @@ calls to "update-initramfs -u", which had the same affect). (Closes: #822730). * dh_installman: Improve error messages and handling of broken - section numbers. Notably ignore (with a warning) sections from - manpages that look suspiciously like a version number. Thanks - to Paul Gevers for reporting the bug. (Closes: #958343) + section numbers. Notably, the auto-detection no longer picks + section numbers that look suspiciously like a version number + (or a date). This can cause dh_installman to reject manpages + if it can no longer guess a suitable section for the manpage + Thanks to Paul Gevers for reporting the bug. + (Closes: #958343) * Dh_Lib.pm: Support that Architecture (among other fields) can be folded in d/control. Thanks to Thorsten Glaser for reporting the issue. (Closes: #958987) diff -Nru debhelper-13.1/debian/git-build-recipe.manifest debhelper-13.2/debian/git-build-recipe.manifest --- debhelper-13.1/debian/git-build-recipe.manifest 2020-05-17 22:46:47.000000000 +0000 +++ debhelper-13.2/debian/git-build-recipe.manifest 2020-07-06 04:46:49.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-0~202005172228 -lp:ubuntu/+source/debhelper git-commit:b6b3ee360902067c0f17f4a84d1e30515a925e70 +# git-build-recipe format 0.4 deb-version {debupstream}-0~202007060428 +lp:ubuntu/+source/debhelper git-commit:16089852530c8896ee247488869856b02c90c0c1 diff -Nru debhelper-13.1/dh_clean debhelper-13.2/dh_clean --- debhelper-13.1/dh_clean 2020-05-17 22:46:47.000000000 +0000 +++ debhelper-13.2/dh_clean 2020-07-06 04:46:49.000000000 +0000 @@ -120,7 +120,7 @@ if (not $dh{D_FLAG}) { # Restore all files in our bucket (before we delete said bucket) - restore_all_files(); + restore_all_files(1); # Remove internal state data doit('rm', '-rf', 'debian/.debhelper/'); diff -Nru debhelper-13.1/dh_missing debhelper-13.2/dh_missing --- debhelper-13.1/dh_missing 2020-05-17 22:46:47.000000000 +0000 +++ debhelper-13.2/dh_missing 2020-07-06 04:46:49.000000000 +0000 @@ -196,6 +196,8 @@ if (@missing) { my $had_related_files; my %seen_basename = map { basename($_) => $_ } @installed; + my $multiarch = dpkg_architecture_value("DEB_HOST_MULTIARCH"); + my $seen_ma_value = 0; for my $file (@missing) { my $basename = basename($file); if (exists($seen_basename{$basename})) { @@ -205,6 +207,7 @@ } else { warning("$file exists in $srcdir but is not installed to anywhere "); } + $seen_ma_value = 1 if index($file, $multiarch) > -1; } if ($had_related_files) { my ($missing, $alt_source) = $had_related_files->@*; @@ -240,7 +243,14 @@ nonquiet_print('"Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+).'); nonquiet_print(' (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz)'); nonquiet_print("Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built"); - nonquiet_print("For a short-term work-around: Add the files to debian/not-installed"); + nonquiet_print("If the omission is intentional or no other helper can take care of this consider adding the"); + nonquiet_print("paths to debian/not-installed."); + if ($seen_ma_value) { + nonquiet_print(); + nonquiet_print("Remember to be careful with paths containing \"${multiarch}\", where you might need to"); + nonquiet_print("use a wildcard or (assuming compat 13+) e.g. \${DEB_HOST_MULTIARCH} in debian/not-installed"); + nonquiet_print("to ensure it works on all architectures (see #961104)."); + } if ($dh{FAIL_MISSING}) { error("missing files, aborting"); } diff -Nru debhelper-13.1/lib/Debian/Debhelper/Buildsystem/cmake.pm debhelper-13.2/lib/Debian/Debhelper/Buildsystem/cmake.pm --- debhelper-13.1/lib/Debian/Debhelper/Buildsystem/cmake.pm 2020-05-17 22:46:47.000000000 +0000 +++ debhelper-13.2/lib/Debian/Debhelper/Buildsystem/cmake.pm 2020-07-06 04:46:49.000000000 +0000 @@ -83,13 +83,11 @@ my @flags = @STANDARD_CMAKE_FLAGS; my $backend = $this->get_targetbuildsystem->NAME; - if (not compat(10)) { - push(@flags, '-DCMAKE_INSTALL_RUNSTATEDIR=/run'); - } - if (not compat(12)) { - # Speed up installation phase a bit. - push(@flags, "-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON"); - } + push(@flags, '-DCMAKE_INSTALL_RUNSTATEDIR=/run') if not compat(10); + # Speed up installation phase a bit. + push(@flags, "-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON") if not compat(12); + # Reproducibility #962474 + push(@flags, "-DCMAKE_SKIP_RPATH=ON", '-DBUILD_RPATH_USE_ORIGIN=ON') if not compat(13); if (exists($TARGET_BUILD_SYSTEM2CMAKE_GENERATOR{$backend})) { my $generator = $TARGET_BUILD_SYSTEM2CMAKE_GENERATOR{$backend}; push(@flags, "-G${generator}"); diff -Nru debhelper-13.1/lib/Debian/Debhelper/Dh_Buildsystems.pm debhelper-13.2/lib/Debian/Debhelper/Dh_Buildsystems.pm --- debhelper-13.1/lib/Debian/Debhelper/Dh_Buildsystems.pm 2020-05-17 22:46:47.000000000 +0000 +++ debhelper-13.2/lib/Debian/Debhelper/Dh_Buildsystems.pm 2020-07-06 04:46:49.000000000 +0000 @@ -281,9 +281,31 @@ my $buildsystem = load_buildsystem($opt_buildsys, $step); if (defined $buildsystem) { - $buildsystem->pre_building_step($step); - $buildsystem->$step(@_, @{$dh{U_PARAMS}}); - $buildsystem->post_building_step($step); + my ($xdg_runtime_dir, $err, $ref); + local $SIG{'INT'} = sub { $ref = 'INT'; die(\$ref); }; + local $SIG{'TERM'} = sub { $ref = 'TERM'; die(\$ref); }; + if ($step eq 'test' and not compat(12)) { + require File::Temp; + $xdg_runtime_dir = File::Temp->newdir('dh-xdg-rundir-XXXXXXXX', + TMPDIR => 1, + CLEANUP => 1, + ); + $ENV{'XDG_RUNTIME_DIR'} = $xdg_runtime_dir->dirname; + } + eval { + $buildsystem->pre_building_step($step); + $buildsystem->$step(@_, @{$dh{U_PARAMS}}); + $buildsystem->post_building_step($step); + }; + $err = $@; + doit('rm', '-fr', '--', $xdg_runtime_dir) if $xdg_runtime_dir; + if ($err) { + my $sig; + die($err) if $err ne \$ref; + $sig = $ref; + delete($SIG{$sig}); + kill($sig => $$); + } } return 0; } diff -Nru debhelper-13.1/lib/Debian/Debhelper/Dh_Lib.pm debhelper-13.2/lib/Debian/Debhelper/Dh_Lib.pm --- debhelper-13.1/lib/Debian/Debhelper/Dh_Lib.pm 2020-05-17 22:46:47.000000000 +0000 +++ debhelper-13.2/lib/Debian/Debhelper/Dh_Lib.pm 2020-07-06 04:46:49.000000000 +0000 @@ -47,6 +47,9 @@ # TODO: Find a way to determine this automatically from the vendor # - blocked by Dpkg::Vendor having a rather high load time (for debhelper) 'DBGSYM_PACKAGE_TYPE' => DEFAULT_PACKAGE_TYPE, + # Lowest compat level supported that is not scheduled for removal. + # - Set to MIN_COMPAT_LEVEL when there are no pending compat removals. + 'MIN_COMPAT_LEVEL_NOT_SCHEDULED_FOR_REMOVAL' => 7, }; @@ -872,6 +875,7 @@ # is less than or equal to that number. my $compat_from_bd; { + my $check_pending_removals = get_buildoption('dherroron', '') eq 'obsolete-compat-levels' ? 1 : 0; my $warned_compat = $ENV{DH_INTERNAL_TESTSUITE_SILENT_WARNINGS} ? 1 : 0; my $c; @@ -931,6 +935,11 @@ error("Compatibility levels before ${\MIN_COMPAT_LEVEL} are no longer supported (level $c requested)"); } + if ($check_pending_removals and $c < MIN_COMPAT_LEVEL_NOT_SCHEDULED_FOR_REMOVAL) { + my $v = MIN_COMPAT_LEVEL_NOT_SCHEDULED_FOR_REMOVAL; + error("Compatibility levels before ${v} are scheduled for removal and DH_COMPAT_ERROR_ON_PENDING_REMOVAL was set (level $c requested)"); + } + if ($c < LOWEST_NON_DEPRECATED_COMPAT_LEVEL && ! $warned_compat) { warning("Compatibility levels before ${\LOWEST_NON_DEPRECATED_COMPAT_LEVEL} are deprecated (level $c in use)"); $warned_compat=1; @@ -2458,11 +2467,8 @@ require Cwd; my $cwd = Cwd::getcwd(); my $home_dir = join('/', $cwd, generated_file('_source', 'home', 0)); - my $xdg_rundir = join('/', $cwd, generated_file('_source', 'xdg-runtime-dir', 0)); - my $creating_rundir = -d $xdg_rundir ? 0 : 1; my @paths = ( $home_dir, - $xdg_rundir, ); my @clear_env = qw( XDG_CACHE_HOME @@ -2470,16 +2476,13 @@ XDG_CONFIG_HOME XDG_DATA_HOME XDG_DATA_DIRS + XDG_RUNTIME_DIR ); install_dir(@paths); - if ($creating_rundir) { - chmod(0700, $xdg_rundir) == 1 or warning("chmod(0700, \"$xdg_rundir\") failed: $! (ignoring)"); - } for my $envname (@clear_env) { delete($ENV{$envname}); } $ENV{'HOME'} = $home_dir; - $ENV{'XDG_RUNTIME_DIR'} = $xdg_rundir; return; } @@ -2517,20 +2520,25 @@ # Gets a DEB_BUILD_OPTIONS option, if set. sub get_buildoption { - my $wanted=shift; + my ($wanted, $default) = @_; - return undef unless exists $ENV{DEB_BUILD_OPTIONS}; + return $default if not exists($ENV{DEB_BUILD_OPTIONS}); foreach my $opt (split(/\s+/, $ENV{DEB_BUILD_OPTIONS})) { # currently parallel= is the only one with a parameter if ($opt =~ /^parallel=(-?\d+)$/ && $wanted eq 'parallel') { return $1; - } - elsif ($opt eq $wanted) { + } elsif ($opt =~ m/^dherroron=(\S*)$/ && $wanted eq 'dherroron') { + my $value = $1; + if ($value ne 'obsolete-compat-levels') { + warning("Unknown value \"${value}\" as parameter for \"dherrron\" seen in DEB_BUILD_OPTIONS"); + } + return $value; + } elsif ($opt eq $wanted) { return 1; } } - return undef; + return $default; } # Returns true if DEB_BUILD_PROFILES lists the given profile. @@ -2623,6 +2631,7 @@ } sub restore_all_files { + my ($clear_index) = @_; my $bucket_index = 'debian/.debhelper/bucket/index'; my $bucket_dir = 'debian/.debhelper/bucket/files'; @@ -2644,6 +2653,7 @@ rename_path("${bucket_file}.tmp", $stored_file); } close($fd); + rm_files($bucket_index) if $clear_index; return; } diff -Nru debhelper-13.1/man/po4a/po/debhelper.pot debhelper-13.2/man/po4a/po/debhelper.pot --- debhelper-13.1/man/po4a/po/debhelper.pot 2020-05-17 22:46:48.000000000 +0000 +++ debhelper-13.2/man/po4a/po/debhelper.pot 2020-07-06 04:46:49.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-05-17 19:08+0200\n" +"POT-Creation-Date: 2020-07-05 23:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -119,9 +119,10 @@ #. 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 files like F when needed." +"Except where the tool explicitly denotes otherwise, all of the debhelper " +"tools assume that they run from the root directory of an unpacked source " +"package. This is so they can locate find files like F when " +"needed." msgstr "" #. type: =head1 @@ -245,12 +246,84 @@ #: debhelper.pod:106 msgid "" "In compatibility level 13 and later, it is possible to use simple " -"substitutions in I debhelper config files (particularly, the " -"configuration files for L)." +"substitutions in debhelper config files for the following tools:" +msgstr "" + +#. type: =item +#: debhelper.pod:111 debhelper.pod:115 debhelper.pod:119 debhelper.pod:123 +#: debhelper.pod:127 debhelper.pod:131 debhelper.pod:135 debhelper.pod:139 +#: debhelper.pod:143 debhelper.pod:147 debhelper.pod:151 debhelper.pod:155 +#: debhelper.pod:159 debhelper.pod:247 debhelper.pod:252 +msgid "*" +msgstr "" + +#. type: textblock +#: debhelper.pod:113 +msgid "dh_clean" +msgstr "" + +#. type: textblock +#: debhelper.pod:117 +msgid "dh_install" +msgstr "" + +#. type: textblock +#: debhelper.pod:121 +msgid "dh_installcatalogs" +msgstr "" + +#. type: textblock +#: debhelper.pod:125 +msgid "dh_installdeb" +msgstr "" + +#. type: textblock +#: debhelper.pod:129 +msgid "dh_installdirs" +msgstr "" + +#. type: textblock +#: debhelper.pod:133 +msgid "dh_installdocs" +msgstr "" + +#. type: textblock +#: debhelper.pod:137 +msgid "dh_installexamples" +msgstr "" + +#. type: textblock +#: debhelper.pod:141 +msgid "dh_installinfo" +msgstr "" + +#. type: textblock +#: debhelper.pod:145 +msgid "dh_installman" +msgstr "" + +#. type: textblock +#: debhelper.pod:149 +msgid "dh_installwm" +msgstr "" + +#. type: textblock +#: debhelper.pod:153 +msgid "dh_link" +msgstr "" + +#. type: textblock +#: debhelper.pod:157 +msgid "dh_missing" +msgstr "" + +#. type: textblock +#: debhelper.pod:161 +msgid "dh_ucf" msgstr "" #. type: textblock -#: debhelper.pod:110 +#: debhelper.pod:165 msgid "" "All substitution variables are of the form I<${foo}> and the braces are " "mandatory. Variable names are case-sensitive and consist of alphanumerics " @@ -259,38 +332,38 @@ msgstr "" #. type: textblock -#: debhelper.pod:115 +#: debhelper.pod:170 msgid "" "If you need a literal dollar sign that cannot trigger a substitution, you " "can either use the B<${Dollar}> substitution or the sequence B<${}>." msgstr "" #. type: textblock -#: debhelper.pod:118 +#: debhelper.pod:173 msgid "The following expansions are available:" msgstr "" #. type: =item -#: debhelper.pod:122 +#: debhelper.pod:177 msgid "B, B, B" msgstr "" #. type: textblock -#: debhelper.pod:124 +#: debhelper.pod:179 msgid "" "Expands to the relevant L value (similar to " "I)." msgstr "" #. type: textblock -#: debhelper.pod:127 +#: debhelper.pod:182 msgid "" "When in doubt, the B variant is the one that will work both for " "native and cross builds." msgstr "" #. type: textblock -#: debhelper.pod:130 +#: debhelper.pod:185 msgid "" "For performance reasons, debhelper will attempt to resolve these names from " "the environment first before consulting L. This is " @@ -298,19 +371,19 @@ msgstr "" #. type: =item -#: debhelper.pod:135 +#: debhelper.pod:190 msgid "B" msgstr "" #. type: textblock -#: debhelper.pod:137 +#: debhelper.pod:192 msgid "" "Expands to a single literal B<$>-symbol. This symbol will I be " "considered part of a substitution variable. That is:" msgstr "" #. type: verbatim -#: debhelper.pod:140 +#: debhelper.pod:195 #, no-wrap msgid "" " # Triggers an error\n" @@ -321,43 +394,43 @@ msgstr "" #. type: textblock -#: debhelper.pod:145 +#: debhelper.pod:200 msgid "" "This variable equivalent to the sequence B<${}> and the two can be used " "interchangeably." msgstr "" #. type: =item -#: debhelper.pod:148 +#: debhelper.pod:203 msgid "B, B, B" msgstr "" #. type: textblock -#: debhelper.pod:150 +#: debhelper.pod:205 msgid "Expands to a single ASCII newline, space and tab respectively." msgstr "" #. type: textblock -#: debhelper.pod:152 +#: debhelper.pod:207 msgid "" "This can be useful if you need to include a literal whitespace character " "(e.g. space) where it would otherwise be stripped or used as a separator." msgstr "" #. type: =item -#: debhelper.pod:156 +#: debhelper.pod:211 msgid "B<< env:I >>" msgstr "" #. type: textblock -#: debhelper.pod:158 +#: debhelper.pod:213 msgid "" "Expands to the environment variable I. The environment variable must " "be set (but can be set to the empty string)." msgstr "" #. type: textblock -#: debhelper.pod:163 +#: debhelper.pod:218 msgid "" "Note that all variables must expand to a defined value. As an example, if " "debhelper sees I<${env:FOO}>, then it will insist that the environment " @@ -365,12 +438,12 @@ msgstr "" #. type: =head3 -#: debhelper.pod:167 +#: debhelper.pod:222 msgid "Substitution limits" msgstr "" #. type: textblock -#: debhelper.pod:169 +#: debhelper.pod:224 msgid "" "To avoid infinite loops and resource exhaustion, debhelper will stop with an " "error if the text contains many substitution variables (50) or they expand " @@ -379,19 +452,19 @@ msgstr "" #. type: =head2 -#: debhelper.pod:174 +#: debhelper.pod:229 msgid "Executable debhelper config files" msgstr "" #. type: textblock -#: debhelper.pod:176 +#: debhelper.pod:231 msgid "" "If you need additional flexibility, many of the debhelper tools " "(e.g. L) support executing a config file as a script." msgstr "" #. type: textblock -#: debhelper.pod:179 +#: debhelper.pod:234 msgid "" "To use this feature, simply mark the config file as executable (e.g. B<< " "chmod +x debian/I.install >>) and the tool will attempt to execute " @@ -401,26 +474,21 @@ msgstr "" #. type: textblock -#: debhelper.pod:187 +#: debhelper.pod:242 msgid "" "When using executable debhelper config files, please be aware of the " "following:" msgstr "" -#. type: =item -#: debhelper.pod:192 debhelper.pod:197 -msgid "*" -msgstr "" - #. type: textblock -#: debhelper.pod:194 +#: debhelper.pod:249 msgid "" "The executable config file B exit with success (i.e. its return code " "should indicate success)." msgstr "" #. type: textblock -#: debhelper.pod:199 +#: debhelper.pod:254 msgid "" "In compatibility level 13+, the output will be subject to substitutions (see " "L) where the tool support these. " @@ -429,14 +497,14 @@ msgstr "" #. type: textblock -#: debhelper.pod:204 +#: debhelper.pod:259 msgid "" "Otherwise, the output will be used exactly as-is. Notably, debhelper will " "I expand wildcards or strip comments or strip whitespace in the output." msgstr "" #. type: textblock -#: debhelper.pod:210 +#: debhelper.pod:265 msgid "" "If you need the package to build on a file system where you cannot disable " "the executable bit, then you can use L and its B " @@ -444,105 +512,105 @@ msgstr "" #. type: =head1 -#: debhelper.pod:214 +#: debhelper.pod:269 msgid "SHARED DEBHELPER OPTIONS" msgstr "" #. type: textblock -#: debhelper.pod:216 +#: debhelper.pod:271 msgid "The following command line options are supported by all debhelper programs." msgstr "" #. type: =item -#: debhelper.pod:220 +#: debhelper.pod:275 msgid "B<-v>, B<--verbose>" msgstr "" #. type: textblock -#: debhelper.pod:222 +#: debhelper.pod:277 msgid "Verbose mode: show all commands that modify the package build directory." msgstr "" #. type: =item -#: debhelper.pod:224 dh:266 +#: debhelper.pod:279 dh:266 msgid "B<--no-act>" msgstr "" #. type: textblock -#: debhelper.pod:226 +#: debhelper.pod:281 msgid "" "Do not really do anything. If used with -v, the result is that the command " "will output what it would have done." msgstr "" #. type: =item -#: debhelper.pod:229 +#: debhelper.pod:284 msgid "B<-a>, B<--arch>" msgstr "" #. type: textblock -#: debhelper.pod:231 +#: debhelper.pod:286 msgid "" "Act on architecture dependent packages that should be built for the " "B architecture." msgstr "" #. type: =item -#: debhelper.pod:234 +#: debhelper.pod:289 msgid "B<-i>, B<--indep>" msgstr "" #. type: textblock -#: debhelper.pod:236 +#: debhelper.pod:291 msgid "Act on all architecture independent packages." msgstr "" #. type: =item -#: debhelper.pod:238 +#: debhelper.pod:293 msgid "B<-p>I, B<--package=>I" msgstr "" #. type: textblock -#: debhelper.pod:240 +#: debhelper.pod:295 msgid "" "Act on the package named I. This option may be specified multiple " "times to make debhelper operate on a given set of packages." msgstr "" #. type: =item -#: debhelper.pod:243 +#: debhelper.pod:298 msgid "B<-s>, B<--same-arch>" msgstr "" #. type: textblock -#: debhelper.pod:245 +#: debhelper.pod:300 msgid "Deprecated alias of B<-a>." msgstr "" #. type: textblock -#: debhelper.pod:247 dh_install:80 dh_install:89 +#: debhelper.pod:302 dh_install:80 dh_install:89 msgid "This option is removed in compat 12." msgstr "" #. type: =item -#: debhelper.pod:249 +#: debhelper.pod:304 msgid "B<-N>I, B<--no-package=>I" msgstr "" #. type: textblock -#: debhelper.pod:251 +#: debhelper.pod:306 msgid "" "Do not act on the specified package even if an B<-a>, B<-i>, or B<-p> option " "lists the package as one that should be acted on." msgstr "" #. type: =item -#: debhelper.pod:254 +#: debhelper.pod:309 msgid "B<--remaining-packages>" msgstr "" #. type: textblock -#: debhelper.pod:256 +#: debhelper.pod:311 msgid "" "Do not act on the packages which have already been acted on by this " "debhelper command earlier (i.e. if the command is present in the package " @@ -552,22 +620,22 @@ msgstr "" #. type: =item -#: debhelper.pod:262 +#: debhelper.pod:317 msgid "B<-P>I, B<--tmpdir=>I" msgstr "" #. type: textblock -#: debhelper.pod:264 +#: debhelper.pod:319 msgid "Use I for package build directory. The default is debian/I" msgstr "" #. type: =item -#: debhelper.pod:266 +#: debhelper.pod:321 msgid "B<--mainpackage=>I" msgstr "" #. type: textblock -#: debhelper.pod:268 +#: debhelper.pod:323 msgid "" "This little-used option changes the package which debhelper considers the " "\"main package\", that is, the first one listed in F, and " @@ -576,12 +644,12 @@ msgstr "" #. type: =item -#: debhelper.pod:273 +#: debhelper.pod:328 msgid "B<-O=>I