From bb6c720197c30fd6543955c5c80da942e02c2f1a20a64908fd5890f6e7b0037d Mon Sep 17 00:00:00 2001 From: Jan Baier Date: Mon, 18 Oct 2021 09:37:39 +0000 Subject: [PATCH 1/2] - Update to version 13.4.1 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/debhelper?expand=0&rev=15 --- debhelper-debian-13.3.4.tar.gz | 3 -- debhelper-debian-13.4.1.tar.gz | 3 ++ debhelper.changes | 80 ++++++++++++++++++++++++++++++++++ debhelper.spec | 2 +- 4 files changed, 84 insertions(+), 4 deletions(-) delete mode 100644 debhelper-debian-13.3.4.tar.gz create mode 100644 debhelper-debian-13.4.1.tar.gz diff --git a/debhelper-debian-13.3.4.tar.gz b/debhelper-debian-13.3.4.tar.gz deleted file mode 100644 index 0965acb..0000000 --- a/debhelper-debian-13.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16aba75e3dfeb5d88e8577a6f73084628ea7853a9b01d32151b7f35c2d69949b -size 1060818 diff --git a/debhelper-debian-13.4.1.tar.gz b/debhelper-debian-13.4.1.tar.gz new file mode 100644 index 0000000..c29f494 --- /dev/null +++ b/debhelper-debian-13.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:196c46757c8bf321fcc74cc087c2e92ec20905cd0afccf01d60aa2765e806b9a +size 1062358 diff --git a/debhelper.changes b/debhelper.changes index 0787021..83da984 100644 --- a/debhelper.changes +++ b/debhelper.changes @@ -1,3 +1,83 @@ +------------------------------------------------------------------- +Mon Oct 18 09:14:43 UTC 2021 - Jan Baier + +- Update to version 13.4.1 + * autoscripts/*: Replace `which` with `command -v`. + * dh_installsystemd: Only merge /lib/systemd/system into /usr + for now. (Closes: #992554) + * dh_systemd_enable: Ditto. + * autoscripts/postinst-init-nostart: Call invoke-rc.d when + a non-empty DPKG_ROOT is used. (Closes: #992556) + * Replace "use v5.28" with "use v5.24" in Dh_Lib.pm. + The change to "use v5.28" in 13.4 broke the test to distinguish 0755 + from "0755" in the reset_perm_and_owner function, breaking builds. + Thanks Adrian Bunk and Ansgar for help isolating the problem. + * debian/changelog: Correct bug number in the 13.4 entry. + * dh_dwz: run in parallel across packages. (Closes: !47) + * Dh_Buildsystems.pm: Add bmake and mkcmake as third-party + build systems. (Closes: !46) + * Dh_Buildsystems.pm: Add golang as a third-party build + system. (Closes: #981106) + * autoscripts/*: Add support for DPKG_ROOT in systemd, tmpusers, + sysusers and init related snippets. Based on an initial patch + from Helmut Grohne. (Closes: #983566) + * autoscripts/*: Reorder conditions in some scripts to avoid + doing a redundant stat call when a script parameter can decide + to skip it. + * dh_gconf: Remove the command as it does nothing. + (Closes: #908845) + * doc/TODO: Remove reference to dh_gconf. + * root_sequence.pm: Remove dh_gconf from root sequence and declare + it as obsolete (causing errors from compat 14 if still referenced + in hook targets). + * man/po4a/po4a.cfg: Remove dh_gconf from translations. + * AddonAPI.pm: The declare_command_obsolete command now accepts an + "$error_compat" parameter to enable addons to choose which compat + level that will trigger an error (though it must be minimum 13). + * doc/PROGRAMMING: Update docs to reflect API change. + * debhelper.pod: Document that referencing dh_gconf in hook targets + will cause an error in compat 14. + * dh_fixperms: Correct permissions of files beneath usr/libexec to + be executable. (Closes: #979401) + * dh_installtmpfiles: Only register tmpfiles ending with ".conf" as + tmpfiles in /usr/lib/tmpfiles.d and /etc/tmpfiles.d. This ensures + that dh_installtmpfiles gracefully copes with e.g. README files + provided by systemd upstream. (Closes: #986329) + * dh_installsystemd: Ditto (but only relevant in compat 12 or + earlier) + * cmake.pm: Pass -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF to cmake in + addition to -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON as the + former is intended to replace the latter. Thanks to Raul Tambre + for reporting the issue. (Closes: #988973) + * Dh_Lib.pm: Bump version requirement to v5.28 to reflect the actual + requirements (the code was using v5.28 features). Thanks to + Sérgio Basto for reporting the issue. + * dh_missing: Ditto. + * autoscripts/postinst-init,autoscripts/postinst-systemd-start: Use + "restart" instead of "start" when starting the services. This + ensures a smooth transition from --restart-after-upgrade to + --no-restart-after-upgrade in dh_installinit and dh_installsystemd. + Thanks to Ryan Tandy for reporting the issue. + (Closes: #989155) + * dh_installsystemd: Remove usage of autoscripts/postinst-systemd-restart + * dh_installinit: Remove usage of autoscripts/postinst-init-restart + * autoscripts/autoscripts/postinst-systemd-restart: Removed. + * autoscripts/postinst-init-restart: Removed + * dh_installsystemd: Prefer /usr/lib/systemd/ to /lib/systemd. + (Closes: #987989) + * dh_systemd_enable: Ditto. + * dh_systemd_start: Ditto. + * dh_installinit: Ditto. + * dh_installsystemd: Merge /lib/systemd into /usr/lib/systemd if both + are present in the package staging directory (prefering the latter + in case of conflicts). (Closes: #987989) + * dh_systemd_enable: Ditto. + * perl_build.pm,perl_makemaker.pm: Make debhelper use the same perl + as it runs under (via Perl's $^X variable) when invoking the + upstream build system. (Closes: !40, #966396) + * Always generate unique doc-base file names based on package name and + document ID. (Closes: #980903) + ------------------------------------------------------------------- Tue Mar 16 14:41:10 UTC 2021 - Jan Baier diff --git a/debhelper.spec b/debhelper.spec index 36a858c..3da759b 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -17,7 +17,7 @@ Name: debhelper -Version: 13.3.4 +Version: 13.4.1 Release: 0 Summary: Helper programs for debian/rules License: GPL-2.0-or-later From 8a9689ef155ecab0af107343e85107485b2744cfd54582f916edfc327fce823c Mon Sep 17 00:00:00 2001 From: Jan Baier Date: Mon, 18 Oct 2021 10:30:43 +0000 Subject: [PATCH 2/2] -Update to version 13.5.2 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/debhelper?expand=0&rev=16 --- debhelper-debian-13.4.1.tar.gz | 3 -- debhelper-debian-13.5.2.tar.gz | 3 ++ debhelper.changes | 58 ++++++++++++++++++++++++++++++++++ debhelper.spec | 6 ++-- 4 files changed, 64 insertions(+), 6 deletions(-) delete mode 100644 debhelper-debian-13.4.1.tar.gz create mode 100644 debhelper-debian-13.5.2.tar.gz diff --git a/debhelper-debian-13.4.1.tar.gz b/debhelper-debian-13.4.1.tar.gz deleted file mode 100644 index c29f494..0000000 --- a/debhelper-debian-13.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:196c46757c8bf321fcc74cc087c2e92ec20905cd0afccf01d60aa2765e806b9a -size 1062358 diff --git a/debhelper-debian-13.5.2.tar.gz b/debhelper-debian-13.5.2.tar.gz new file mode 100644 index 0000000..69118f6 --- /dev/null +++ b/debhelper-debian-13.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66a6a9ffeafb95c483e6a2688fc41e05f3811a722dbd59dd489b3eb21b88da0b +size 1081293 diff --git a/debhelper.changes b/debhelper.changes index 83da984..8e9d3b1 100644 --- a/debhelper.changes +++ b/debhelper.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Mon Oct 18 10:28:08 UTC 2021 - Jan Baier + +-Update to version 13.5.2 + * dh_installsystemd: Revert change to deploy systemd files into + usr/lib/systemd. (Closes: #993316, #993759) + * dh_installinit: Ditto. + * dh_systemd_enable: Ditto. + * dh_systemd_start: Ditto. + * SequencerUtil.pm: Remove duplicate "-a" option to some commands. + Thanks to Christoph Berg for reporting the issue. + (Closes: #971761) + * dh_installdeb: Revert the change to rewrite `rm_conffiles` into + `remove-on-upgrade` due to it causing bugs in non-trivial cases. + (Closes: #994919) + * dh_installtmpfiles: Add missing option name in POD documentation. + * cmake.pm: make it possible to override dh provided ctest arguments + * cmake.pm: Add missing import which broke cmake related builds. + Thanks to Boyuan Yang for reporting the issue. + (Closes: #993345) + * dh_installdeb: Install debian/conffiles in compat 12+ again + (undoing the compat 12 change saying dh_installdeb would ignore + this file). The file can now be using for the activating the + `remove-on-upgrade` feature from dpkg 1.20. + * dh_installdeb: Automatically rewrite `rm_conffiles` into the + new `remove-on-upgrade` feature from dpkg when possible. + * cmake.pm: Pass `ARGS+=--verbose` to make when running tests + in the cmake+make variant except when "terse" is in + DEB_BUILD_OPTIONS. Thanks to Paul Wise for the suggestion. + (Closes: #992623) + * python_support.pm: Remove obsolete dh addon. It did nothing + but warn and nothing used it anymore. + * dh: Document debhelper provided dh addon sequences. + * single_binary.pm: New dh addon ("single-binary") that explicitly + activates the "single binary" work flow, where dh_auto_install + uses debian/ as default --destdir when there is only a + single binary package. It will error out if used in a + source package building multiple binary packages. + * dh: Activate "single-binary" addon by default in compat levels + up to and including compat 14 when the source package only lists + one binary package in debian/control. In compat 14, emit a warning + when this happens implicitly requesting users to explicitly enable + or disable the addon for single binary source packages to avoid + surprises in compat 15. + * dh_auto_install: In compat 15, remove special-case default for + --destdir for single binary source packages. If the previous + default is desired, please use the "single-binary" dh addon or + explicitly pass --destdir to dh_auto_install. + (Closes: #971432) + * debian/control: Provide dh-sequence-single-binary. + * debhelper.pod: Document the dh_auto_install will change behaviour + in compat 15 for single binary packages and dh will warning about + that in compat 14. + * dh_assistant: New tool for assisting third-party tools. At the + moment, it primarily supports introspection related features but + will hopefully be extended to support more use cases. + (Closes: #984900) + ------------------------------------------------------------------- Mon Oct 18 09:14:43 UTC 2021 - Jan Baier diff --git a/debhelper.spec b/debhelper.spec index 3da759b..10803b4 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -17,7 +17,7 @@ Name: debhelper -Version: 13.4.1 +Version: 13.5.2 Release: 0 Summary: Helper programs for debian/rules License: GPL-2.0-or-later @@ -28,8 +28,8 @@ Source0: https://salsa.debian.org/debian/debhelper/-/archive/debian/%{ver Patch0: debhelper-no-localized-manpages.patch # PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages. Patch1: debhelper-pod2man-no-utf8.patch -Requires: dh-autoreconf > 10 -Requires: dpkg +Requires: dh-autoreconf >= 17 +Requires: dpkg >= 1.18 Requires: strip-nondeterminism Provides: deb:%{_bindir}/dh_install BuildArch: noarch