[debhelper-devel] [debhelper] 04/05: Merge tag 'debian/10.2.2' into jessie-backports
Niels Thykier
nthykier at moszumanska.debian.org
Sat Oct 15 08:53:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch jessie-backports
in repository debhelper.
commit 8b61fbc06fbeaa035212bcaf30f20daa2bbed4ab
Merge: 139830f 834dd62
Author: Niels Thykier <niels at thykier.net>
Date: Sat Oct 15 08:24:28 2016 +0000
Merge tag 'debian/10.2.2' into jessie-backports
Release debhelper/10.2.2 into unstable
Format: 1.8
Date: Sat, 08 Oct 2016 10:16:23 +0000
Source: debhelper
Binary: debhelper dh-systemd
Architecture: source
Version: 10.2.2
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: 839681
Changes:
debhelper (10.2.2) unstable; urgency=medium
.
* Fix typo in changelog entry for release 10.2. Thanks to
Peter Pentchev for reporting it.
* Deprecate all compat levels lower than 9.
* dh: Discard override log files before running the override
rather than after.
* dh_compress,dh_fixperms: Remove references to long
obsolete directories such as usr/info, usr/man and
usr/X11*/man.
* autoreconf.pm: Apply patch from Helmut Grohne to fix
autoconf/cross regression from #836988. The autoreconf
build-system is now also used directly for "clean" and
"build" (while still usin the "make" build-system for the
heavy lifting). (Closes: #839681)
* dh_installdirs: In compat 11, avoid creating debian/<pkg>
directories except when required to do so. This fixes a
corner case, where an arch:all build would behave
differently than an arch:all+arch:any when dh_installdir is
optimised out only for the arch:all build.
* Dh_Lib.pm: Fix typo of positive. Thanks to Matthias Klose
for spotting it.
Checksums-Sha1:
6ee7f892f090e936cd374864839e7a3e40334975 1701 debhelper_10.2.2.dsc
2e70b5b72b3b6e08da9285af83b262ca74af1e87 355692 debhelper_10.2.2.tar.xz
Checksums-Sha256:
c26e66f492a17a58d8337a262e38c7d89d1569a7e399a9db237657089b34620a 1701 debhelper_10.2.2.dsc
07f84f415f390bd9573a7abc8078203b3f57a2d4590b97010cf75b596b274075 355692 debhelper_10.2.2.tar.xz
Files:
d3f3f96cca9314517cb89d93e9a52a4f 1701 devel optional debhelper_10.2.2.dsc
fed7c37be88f69691ee208c3fc289bb3 355692 devel optional debhelper_10.2.2.tar.xz
.mailmap | 4 +
Debian/Debhelper/Buildsystem/autoconf.pm | 14 +-
Debian/Debhelper/Buildsystem/cmake.pm | 8 +
Debian/Debhelper/Buildsystem/makefile.pm | 16 +-
Debian/Debhelper/Buildsystem/perl_build.pm | 2 +-
Debian/Debhelper/Buildsystem/perl_makemaker.pm | 2 +-
Debian/Debhelper/Dh_Buildsystems.pm | 38 +++-
Debian/Debhelper/Dh_Getopt.pm | 9 +
Debian/Debhelper/Dh_Lib.pm | 69 ++++---
Debian/Debhelper/Sequence/systemd.pm | 14 ++
Makefile | 12 +-
autoscripts/postinst-systemd-dont-enable | 13 ++
autoscripts/postinst-systemd-enable | 13 ++
autoscripts/postinst-systemd-restart | 9 +
autoscripts/postinst-systemd-start | 4 +
autoscripts/postrm-systemd | 12 ++
autoscripts/postrm-systemd-reload-only | 3 +
autoscripts/prerm-systemd | 3 +
autoscripts/prerm-systemd-restart | 3 +
debhelper-obsolete-compat.pod | 128 ++++++++++++
debhelper.pod | 135 +++++++++++-
debian/changelog | 176 ++++++++++++++++
debian/compat | 2 +-
debian/control | 39 +++-
debian/copyright | 31 +++
debian/rules | 3 +
dh | 6 +-
dh_bugfiles | 6 +-
dh_builddeb | 4 +-
dh_clean | 5 +
dh_compress | 2 +-
dh_fixperms | 6 +-
dh_gconf | 2 +-
dh_gencontrol | 15 +-
dh_icons | 2 +-
dh_install | 18 +-
dh_installcatalogs | 9 +-
dh_installchangelogs | 7 +-
dh_installcron | 8 +-
dh_installdeb | 6 +-
dh_installdebconf | 6 +-
dh_installdirs | 4 +-
dh_installdocs | 19 +-
dh_installemacsen | 18 +-
dh_installexamples | 6 +-
dh_installifupdown | 4 +-
dh_installinfo | 4 +-
dh_installinit | 35 +---
dh_installlogcheck | 4 +-
dh_installlogrotate | 4 +-
dh_installman | 6 +-
dh_installmanpages | 4 +-
dh_installmenu | 30 +--
dh_installmime | 8 +-
dh_installmodules | 6 +-
dh_installpam | 4 +-
dh_installppp | 4 +-
dh_installudev | 5 +-
dh_installwm | 2 +-
dh_lintian | 4 +-
dh_makeshlibs | 17 +-
dh_md5sums | 16 +-
dh_movefiles | 4 +-
dh_perl | 9 +-
dh_shlibdeps | 11 +-
dh_strip | 29 +--
dh_systemd_enable | 272 +++++++++++++++++++++++++
dh_systemd_start | 253 +++++++++++++++++++++++
dh_ucf | 2 +-
dh_update_autotools_config | 2 +-
dh_usrlocal | 2 +-
doc/PROGRAMMING | 18 +-
man/po4a/po4a.cfg | 4 +
strings-kept-translations.pod | 10 +
t/buildsystems/autoconf/configure | 1 +
t/buildsystems/buildsystem_tests.t | 74 ++++---
t/buildsystems/debian/compat | 2 +-
t/dh_install.t | 4 +-
t/dh_installdocs/debian/changelog | 5 +
t/dh_installdocs/debian/compat | 1 +
t/dh_installdocs/debian/control | 20 ++
t/dh_installdocs/debian/docfile | 1 +
t/dh_installdocs/dh_installdocs.t | 78 +++++++
t/{maintscript => maintscript.t} | 5 +-
t/syntax.t | 3 +-
85 files changed, 1562 insertions(+), 316 deletions(-)
diff --cc debian/changelog
index 775f7c0,cc44474..91e69d0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,179 +1,189 @@@
+ debhelper (10.2.2) unstable; urgency=medium
+
+ * Fix typo in changelog entry for release 10.2. Thanks to
+ Peter Pentchev for reporting it.
+ * Deprecate all compat levels lower than 9.
+ * dh: Discard override log files before running the override
+ rather than after.
+ * dh_compress,dh_fixperms: Remove references to long
+ obsolete directories such as usr/info, usr/man and
+ usr/X11*/man.
+ * autoreconf.pm: Apply patch from Helmut Grohne to fix
+ autoconf/cross regression from #836988. The autoreconf
+ build-system is now also used directly for "clean" and
+ "build" (while still usin the "make" build-system for the
+ heavy lifting). (Closes: #839681)
+ * dh_installdirs: In compat 11, avoid creating debian/<pkg>
+ directories except when required to do so. This fixes a
+ corner case, where an arch:all build would behave
+ differently than an arch:all+arch:any when dh_installdir is
+ optimised out only for the arch:all build.
+ * Dh_Lib.pm: Fix typo of positive. Thanks to Matthias Klose
+ for spotting it.
+
+ -- Niels Thykier <niels at thykier.net> Sat, 08 Oct 2016 10:16:23 +0000
+
+ debhelper (10.2.1) unstable; urgency=medium
+
+ * d/rules: Add a ./run in front of dh_auto_install. It is
+ technically not needed, but it prevents lintian from assuming
+ that we need to Build-Depend debhelper.
+
+ -- Niels Thykier <niels at thykier.net> Sun, 02 Oct 2016 06:51:49 +0000
+
+ debhelper (10.2) unstable; urgency=medium
+
+ * Apply patch from Peter Pentchev to fix some typos.
+ * Apply patch from Michael Biebl to undo a major
+ regression where all of debhelpers functionality was
+ missing (introduced in 10.1). (Closes: #839557)
+ * dh_installinit,dh_systemd_start: Introduce a new
+ --no-stop-on-upgrade as an alternative to
+ --no-restart-on-upgrade. This new option should
+ reduce the confusion of what it does. Thanks to
+ Michael Biebl for the suggestion.
+
+ -- Niels Thykier <niels at thykier.net> Sun, 02 Oct 2016 06:20:56 +0000
+
+ debhelper (10.1) unstable; urgency=medium
+
+ * Apply patch from Michael Biebl to take over dh-systemd
+ package to ease backporting to jessie-backports.
+ (Closes: #837585)
+ * Apply patch from Helmut Grohne and Julian Andres Klode
+ to improve cross-building support in the cmake build
+ system. (Closes: #833789)
+ * Make the makefile.pm buildsystem (but not subclasses thereof)
+ pass the CC and CXX variables set to the host compilers when
+ cross-building. Thanks to Helmut Grohne for the idea and
+ the initial patch. (Closes: #836988)
+ * dh_md5sums.1: Mention dpkg --verify as a consumer of the
+ output file. Thanks to Guillem Jover for reporting it.
+ * debhelper-obsolete-compat.pod: Add a manpage for the
+ upgrade checklist for all obsolete/removed compat levels.
+ Thanks to Jakub Wilk for the suggestion.
+ * Dh_Getopt,dh_*: Rename --onlyscripts to --only-scripts and
+ --noscripts to --no-scripts for consistency with other
+ options. The old variants are accepted for compatibility.
+ Thanks to Raphaël Hertzog for the suggestion.
+ (Closes: #838446)
+ * cmake.pm: If cmake fails, also dump CMakeFiles/CMakeOutput.log
+ and CMakeFiles/CMakeError.log if they are present. Thanks to
+ Michael Banck for the suggestion. (Closes: #839389)
+ * d/copyright: Correct copyright and license of dh_systemd*
+ tools.
+
+ -- Niels Thykier <niels at thykier.net> Sat, 01 Oct 2016 20:45:27 +0000
+
+ debhelper (10) unstable; urgency=medium
+
+ [ Niels Thykier ]
+ * Dh_Lib.pm: Support a new named "beta-tester" compat level.
+ If you want to participate in beta testing of new compat
+ levels, please review "man 7 debhelper" for more
+ information.
+ * Dh_Lib.pm: Fix bug in detection of existing auto-trigger.
+
+ [ Axel Beckert ]
+ * Apply patch by Jens Reyer to fix typo in dh_installdocs man page.
+ (Closes: #836344)
+ * Use uppercase "Debian" in package description when the project is
+ meant. Fixes lintian warning capitalization-error-in-description.
+ * Apply "wrap-and-sort -a"
+ * Add a .mailmap file for making "git shortlog" work properly.
+
+ [ Translations ]
+ * Update German translation (Chris Leick) (Closes: #835593)
+ * Update Portuguese translation (Américo Monteiro)
+ (Closes: #835403)
+ * Update French translation (Baptiste Jammet) (Closes: #836693)
+
+ -- Niels Thykier <niels at thykier.net> Sun, 11 Sep 2016 09:00:23 +0000
+
+ debhelper (9.20160814) unstable; urgency=medium
+
+ * dh_installdocs: Apply patch from Sven Joachim to make
+ --link-doc work again in compat 11 (See: #830309)
+ * t: Apply patch from Sven Joachim to add some test cases
+ to dh_installdocs's --link-doc behaviour.
+ (Closes: #831465)
+ * dh_installinit,dh_systemd_start: Apply patches from
+ Peter Pentchev to make -R default in compat 10 (as
+ documented, but not as implemented).
+ * perl_{build,makemaker}.pm: Apply patch from Dominic
+ Hargreaves to explicitly pass -I. to perl. This is to
+ assist with the fix for CVE-2016-1238. (Closes: #832436)
+ * dh_install: Clarify that "debian/not-installed" is not
+ related to the --exclude parameter.
+ * dh_install: Apply patch from Sven Joachim to support
+ the "debian/tmp" prefix being optional in
+ "debian/not-installed". (Closes: #815506)
+ * Dh_Lib.pm: Apply patch from Dominic Hargreaves to set
+ PERL_USE_UNSAFE_INC to fix a further set of packages
+ which fail to build with . removed from @INC.
+ (Closes: #832436)
+ * Dh_Buildsystems.pm: Enable auto-detection of the maven
+ and gradle buildsystems (provided they are installed).
+ Thanks to Emmanuel Bourg for the suggestion.
+ (Closes: #801732)
+
+ -- Niels Thykier <niels at thykier.net> Sun, 14 Aug 2016 09:19:35 +0000
+
+ debhelper (9.20160709) unstable; urgency=medium
+
+ * Explicitly Build-Depends on perl:any for pod2man instead
+ of relying on it implicitly via libdpkg-perl.
+ * dh_shlibdeps: Clarify that -L is also useful for packages
+ using debian/shlibs.local for private libraries.
+ * dh_installdocs: Apply patch from Sven Joachim to fix a
+ regression with --link-doc and installing extra
+ documentation. (Closes: #830309)
+ * Apply patches from Michael Biebl to merge dh_systemd_enable
+ and dh_systemd_start from the dh-systemd package.
+ (Closes: #822670)
+ * dh: Enable the systemd helpers by default in compat 10 and
+ later.
+
+ -- Niels Thykier <niels at thykier.net> Sat, 09 Jul 2016 09:53:02 +0000
+
+ debhelper (9.20160702) unstable; urgency=medium
+
+ * Start on compat 11.
+ * dh_installmenu: Stop installing menu files in compat 11
+ (menu-methods are still installed).
+ * dh_*: Deprecate -s in favor of -a. The -s option is
+ removed in compat 11.
+ * dh_strip: Fix regression in 9.20160618, which caused
+ issues when there were hardlinked ELF binaries in a
+ package. Thanks to Sven Joachim for the report, the
+ analysis/testing and for providing a patch for the
+ most common case. (Closes: #829142)
+ * Dh_Lib.pm: Cope with the parallel options in make 4.2.
+ Thanks to Martin Dorey for the report. (Closes: #827132)
+ * dh_installdocs: In compat 11, install documentation into
+ /usr/share/doc/mainpackage as requested by policy 3.9.7.
+ Thanks to Sandro Knauß for the report. (Closes: #824221)
+ * dh_perl: Emit perl:any dependencies when a package only
+ contains perl programs (but no modules of any kind).
+ Thanks to Javier Serrano Polo and Niko Tyni for the
+ report and feedback. (Closes: #824696)
+
+ [ Translations ]
+ * Update German translation (Chris Leick + Eduard Bloch)
+ (Closes: #827699)
+
+ -- Niels Thykier <niels at thykier.net> Sat, 02 Jul 2016 13:24:21 +0000
+
+debhelper (9.20160618.1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Revert sgml-base trigger change as it requires a newer
+ version of sgml-base. Bug being reopened: #825005
+ * Disabled features from previous bpo releases:
+ - Disable automatic dbgsym as it requires dpkg-dev 1.18.2
+
+ -- Niels Thykier <niels at thykier.net> Mon, 20 Jun 2016 17:59:46 +0000
+
debhelper (9.20160618.1) unstable; urgency=medium
* Dh_Lib.pm: Reject requests for compat 4 instead of
diff --cc debian/control
index 7f29dce,541e56e..5bc2f4a
--- a/debian/control
+++ b/debian/control
@@@ -2,15 -2,31 +2,30 @@@ Source: debhelpe
Section: devel
Priority: optional
Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
- Uploaders: Niels Thykier <niels at thykier.net>, Bernhard R. Link <brlink at debian.org>, Tianon Gravi <tianon at debian.org>
- Build-Depends: po4a (>= 0.24)
+ Uploaders: Niels Thykier <niels at thykier.net>,
+ Bernhard R. Link <brlink at debian.org>
-Build-Depends: dpkg-dev (>= 1.18.0~),
- perl:any,
++Build-Depends: perl:any,
+ po4a (>= 0.24)
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/debhelper/debhelper.git
Vcs-Browser: https://anonscm.debian.org/git/debhelper/debhelper.git
Package: debhelper
Architecture: all
- Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.17.0), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14), dh-strip-nondeterminism, autotools-dev, dh-autoreconf (>= 12~)
+ Depends: autotools-dev,
+ binutils,
+ dh-autoreconf (>= 12~),
+ dh-strip-nondeterminism,
+ dpkg (>= 1.16.2),
- dpkg-dev (>= 1.18.2~),
++ dpkg-dev (>= 1.17.0)
+ file (>= 3.23),
+ libdpkg-perl (>= 1.17.14),
+ man-db (>= 2.5.1-1),
+ po-debconf,
+ ${misc:Depends},
+ ${perl:Depends}
+ Breaks: dh-systemd (<< 1.38)
+ Replaces: dh-systemd (<< 1.38)
Suggests: dh-make
Multi-Arch: foreign
Description: helper programs for debian/rules
diff --cc dh_installcatalogs
index d33ad9e,af6129a..1077283
--- a/dh_installcatalogs
+++ b/dh_installcatalogs
@@@ -51,9 -52,10 +51,9 @@@ start with F</usr/share/sgml/>
=over 4
- =item B<-n>, B<--noscripts>
+ =item B<-n>, B<--no-scripts>
-Do not modify F<postinst>/F<postrm>/F<prerm> scripts nor add an
-activation trigger.
+Do not modify F<postinst>/F<postrm>/F<prerm> scripts.
=back
--
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