[debhelper-devel] [debhelper] 01/02: Merge tag 'debian/10.10.9' into stretch-backports
Niels Thykier
nthykier at moszumanska.debian.org
Sat Nov 25 10:43:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch stretch-backports
in repository debhelper.
commit 2bd8b87eade7c64c5d62e924267e9b835d9d3d5c
Merge: 8f8c0fa 42ff99d
Author: Niels Thykier <niels at thykier.net>
Date: Sat Nov 25 10:33:38 2017 +0000
Merge tag 'debian/10.10.9' into stretch-backports
Release debhelper/10.10.9 into unstable
Format: 1.8
Date: Sun, 19 Nov 2017 11:04:45 +0000
Source: debhelper
Binary: debhelper dh-systemd
Architecture: source
Version: 10.10.9
Distribution: unstable
Urgency: medium
Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
Changed-By: Niels Thykier <niels at thykier.net>
Description:
debhelper - helper programs for debian/rules
dh-systemd - debhelper add-on to handle systemd unit files - transitional pack
Closes: 882083
Changes:
debhelper (10.10.9) unstable; urgency=medium
.
[ Dmitry Shachnev ]
* qmake.pm: Add missing import of generated_file.
* meson.pm: Find typo of meson in the name of the cross config
file.
* qmake.pm: Push compiler information as ‘early’ flags to qmake, to
make sure qmake calls the right compiler to get library paths.
* qmake.pm: Add all possible settings to generated qmake-cross.conf.
Now output of ‘qmake -query’ with and without using this file is
identical. This makes cross-building Qt’s own modules possible.
.
[ Niels Thykier ]
* dh_missing: Permit a missing debian/tmp without failing in
compat 11 when debian/tmp is an implicit source directory.
Thanks to Christoph Biedl for reporting the bug.
(Closes: #882083)
* dh_missing: Improve the wording about "debian/not-installed".
Checksums-Sha1:
593cbf4629ce7808bacde988cc2d05dc5355e8b1 1795 debhelper_10.10.9.dsc
803db6c38e89e4204bb6af6d342e455a884c2e89 431480 debhelper_10.10.9.tar.xz
eb97a21ce7cba0206c0a638e0d9289638a71f985 4505 debhelper_10.10.9_source.buildinfo
Checksums-Sha256:
04fe06bf677782a887dc0e5c39cd3c6e4c696d54f4938344ae0a5f2fe5e519ac 1795 debhelper_10.10.9.dsc
304c610ee49aa6cb53033a5e6c92232ceb852dff9e457fcf1a9d45bc97c51ca8 431480 debhelper_10.10.9.tar.xz
43911bf042ed361e333af8338d685dfbc695473001b69b5a1c36b3bd56f0f6d7 4505 debhelper_10.10.9_source.buildinfo
Files:
0cb216447d5f0c8460cf3e502bc9a88c 1795 devel optional debhelper_10.10.9.dsc
59b560ace71fa9eb96ccb9332f6b4630 431480 devel optional debhelper_10.10.9.tar.xz
d2cdddbd001d2cd10bb2612258a123b4 4505 devel optional debhelper_10.10.9_source.buildinfo
Makefile | 2 +-
autoscripts/postinst-systemd-restart | 2 +-
debhelper.pod | 62 +---
debian/changelog | 271 +++++++++-----
debian/compat | 2 +-
debian/copyright | 4 +-
debian/rules | 2 +-
dh | 11 +-
dh_auto_build | 2 +
dh_auto_clean | 2 +
dh_auto_configure | 2 +
dh_auto_install | 2 +
dh_auto_test | 2 +
dh_builddeb | 10 +-
dh_gencontrol | 2 +
dh_install | 15 +-
dh_installsystemd | 90 +++--
dh_installudev | 1 -
dh_makeshlibs | 5 +-
dh_missing | 19 +-
dh_perl | 5 +-
dh_strip | 16 +-
lib/Debian/Debhelper/Buildsystem/meson.pm | 2 +-
lib/Debian/Debhelper/Buildsystem/qmake.pm | 41 ++-
lib/Debian/Debhelper/Dh_Getopt.pm | 5 +-
lib/Debian/Debhelper/Dh_Lib.pm | 143 +++++---
lib/Debian/Debhelper/Sequence/dwz.pm | 2 +-
man/po4a/po/de.po | 576 ++++++++++++++----------------
man/po4a/po/debhelper.pot | 334 ++++++-----------
man/po4a/po/es.po | 457 ++++++++++--------------
man/po4a/po/fr.po | 574 ++++++++++++++---------------
man/po4a/po/ja.po | 555 ++++++++++++++--------------
man/po4a/po/pt.po | 570 ++++++++++++++---------------
t/pod.t | 2 +-
34 files changed, 1853 insertions(+), 1937 deletions(-)
diff --cc debian/changelog
index aea0f43,7d47679..05dae64
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,104 +1,116 @@@
+ debhelper (10.10.9) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * qmake.pm: Add missing import of generated_file.
+ * meson.pm: Find typo of meson in the name of the cross config
+ file.
+ * qmake.pm: Push compiler information as ‘early’ flags to qmake, to
+ make sure qmake calls the right compiler to get library paths.
+ * qmake.pm: Add all possible settings to generated qmake-cross.conf.
+ Now output of ‘qmake -query’ with and without using this file is
+ identical. This makes cross-building Qt’s own modules possible.
+
+ [ Niels Thykier ]
+ * dh_missing: Permit a missing debian/tmp without failing in
+ compat 11 when debian/tmp is an implicit source directory.
+ Thanks to Christoph Biedl for reporting the bug.
+ (Closes: #882083)
+ * dh_missing: Improve the wording about "debian/not-installed".
+
+ -- Niels Thykier <niels at thykier.net> Sun, 19 Nov 2017 11:04:45 +0000
+
+ debhelper (10.10.8) unstable; urgency=medium
+
+ [ Niels Thykier ]
+ * Document that compat 11 is now in its open beta phase.
+ * Dh_Getopt: Improve warning message when a package is excluded
+ due to profiles or architecture restrictions.
+ * dh_install: Properly allow patterns to be excluded without
+ complaining about missing files. (Closes: #881658)
+ * qmake.pm: Ensure that the qmake cross-build config file
+ survives until clean.
+
+ [ Dmitry Shachnev ]
+ * qmake.pm: Set QMAKE_LINK correctly for cross-builds.
+
+ -- Niels Thykier <niels at thykier.net> Wed, 15 Nov 2017 19:46:00 +0000
+
+ debhelper (10.10.7) unstable; urgency=medium
+
+ * dh_strip: Fix a regression that caused debug symbols for
+ executables to be discarded instead of included into
+ debug packages.
+ * Dh_Lib: Ensure that $dh{U_PARAMS} is always defined as a
+ list. Thanks to Adrian Bunk for the bug report.
+
+ -- Niels Thykier <niels at thykier.net> Sat, 11 Nov 2017 14:10:21 +0000
+
+ debhelper (10.10.6) unstable; urgency=medium
+
+ [ Axel Beckert ]
+ * Cleanup trailing whitespace in ancient debian/changelog entries and
+ debian/rules.
+ * Fix typo "belive" in debian/copyright and ancient debian/changelog
+ entries.
+ * Use HTTPS in debian/copyright format URL.
+
+ [ Niels Thykier ]
+ * Remove support for named compat levels.
+ * dh_perl: Make dh_perl faster on packages with large doc
+ directories by pruning the entire doc directory.
+ * dh,dh_auto_*: Support skipping all of the dh_auto_* helpers if the
+ package does not seem to have a build system (and there are no build
+ system related options passed to dh).
+ * Dh_Lib.pm: Define a (hardcoded) extension for dbgsym packages.
+ * dh_gencontrol: Pass -DPackage-Type to dpkg-gencontrol when the
+ package type for dbgsym is different than for regular deb packages.
+ * dh_builddeb: Automatically handle renaming of dbgsym packages when
+ the extension of the dbgsym packages are different than for regular
+ deb packages.
+ * dh_installsystemd,dh_systemd_start: Use "restart" instead of the
+ "try-restart" action. This ensures that newly added services are
+ started the first time they are installed. (Closes: #879727,
+ LP: #1707880)
+ * dh_install: Fix regression where it was no longer possible to
+ exclude an entire pattern / source file. Thanks to James Cowgill
+ for the report. (Closes: #814856, LP: #1554979)
+ * dh_installsystemd: Permit missing explicitly requested file in
+ package as long as another on being acted on ships it.
+ * dh_installsystemd: Optimize the search for files installed in the
+ tmpfiles.d directories to only look in the tmpfiles.d directories.
+ * Add experimental support for building some packages for "TARGET"
+ rather than "HOST" via the X-DH-Build-For-Type field. The field
+ is subject to removal and changes without notice. The field is
+ not considered by dpkg tooling and therefore you will still have
+ to manually work around tools like dpkg-gencontrol (even when
+ called via dh_gencontrol).
+ * dh_makeshlibs: Ignore non-ELF files even if they are named ".so".
+ (Closes: #880480)
+ * Dh_Lib: Improve the performance of isnative by using
+ Dpkg::Changelog::Parse instead of calling dpkg-parsechangelog as
+ an external process. This improves the performance of
+ dh_installchangelogs by ~10%.
+
+ [ Felipe Sateler ]
+ * dh_installsystemd: Fix a bug where dh_installsystemd would generate
+ invalid maintscript, when there were no units to start or enable.
+ Thanks to Ben Hutchings and Bastian Blank for the bug report.
+ (Closes: #881190)
+
+ -- Niels Thykier <niels at thykier.net> Sat, 11 Nov 2017 11:18:11 +0000
+
+debhelper (10.10.5~bpo9+1) stretch-backports; urgency=medium
+
+ * Rebuild for stretch-backports.
+ * Dh_Lib: Disable R³ support as we need dpkg{,-dev} (>= 1.19.0.4)
+ for that.
+ * d/control: Remove the R³ field; debhelper in backports cannot
+ be built without (fake)root.
+ * d/control: Reset versioned (Build-)Depends on dpkg and dpkg-dev
+ due to the above.
+
+ -- Niels Thykier <niels at thykier.net> Wed, 01 Nov 2017 19:34:20 +0000
+
debhelper (10.10.5) unstable; urgency=medium
* meson.pm: Add missing import of generated_file that broke
diff --cc lib/Debian/Debhelper/Dh_Lib.pm
index c311231,37be1cc..5dc8b17
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@@ -23,20 -23,19 +23,19 @@@ use constant
'XARGS_INSERT_PARAMS_HERE' => \'<INSERT-HERE>', #'# Hi emacs.
# Magic value for debhelper tools to request "current version"
'DH_BUILTIN_VERSION' => \'<DH_LIB_VERSION>', #'# Hi emacs.
+ # Default Package-Type / extension (must be aligned with dpkg)
+ 'DEFAULT_PACKAGE_TYPE' => 'deb',
# Kill-switch for R³ (for backports)
- 'DH_ENABLE_RRR_SUPPORT' => 1,
+ 'DH_ENABLE_RRR_SUPPORT' => 0,
};
- my %NAMED_COMPAT_LEVELS = (
- # The bleeding-edge compat level is deliberately not documented.
- # You are welcome to use it, but please subscribe to the git
- # commit mails if you do. There is no heads up on changes for
- # bleeding-edge testers as it is mainly intended for debhelper
- # developers.
- 'bleeding-edge-tester' => MAX_COMPAT_LEVEL,
- 'beta-tester' => BETA_TESTER_COMPAT,
- );
+ use constant {
+ # Package-Type / extension for dbgsym packages
+ # 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,
+ };
use Errno qw(ENOENT);
use Exporter qw(import);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list