From 17d3a712fc1bfc3046da99836e60adddad708f94abf2167dd59880f1a315feb0 Mon Sep 17 00:00:00 2001 From: Jan Baier Date: Mon, 2 May 2022 14:36:02 +0000 Subject: [PATCH 1/2] - Update to version 13.7 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/debhelper?expand=0&rev=18 --- debhelper-debian-13.6.tar.gz | 3 -- debhelper-debian-13.7.tar.gz | 3 ++ debhelper-no-localized-manpages.patch | 17 +++++------ debhelper.changes | 41 +++++++++++++++++++++++++++ debhelper.spec | 2 +- 5 files changed, 54 insertions(+), 12 deletions(-) delete mode 100644 debhelper-debian-13.6.tar.gz create mode 100644 debhelper-debian-13.7.tar.gz diff --git a/debhelper-debian-13.6.tar.gz b/debhelper-debian-13.6.tar.gz deleted file mode 100644 index a69e97f..0000000 --- a/debhelper-debian-13.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6be74ac92874b4450e3b35ef22ca6468f148bacdb53b7c2df066f1060f9038b0 -size 1085403 diff --git a/debhelper-debian-13.7.tar.gz b/debhelper-debian-13.7.tar.gz new file mode 100644 index 0000000..8553b6d --- /dev/null +++ b/debhelper-debian-13.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:725742a7bf899021c64cc36e6ba013f49f6caef0b06af686a07092a51d5688d9 +size 1100768 diff --git a/debhelper-no-localized-manpages.patch b/debhelper-no-localized-manpages.patch index 4ab7a4f..4542dee 100644 --- a/debhelper-no-localized-manpages.patch +++ b/debhelper-no-localized-manpages.patch @@ -1,9 +1,9 @@ --- debhelper-debian-10.10.9.orig/Makefile 2017-11-19 12:06:36.000000000 +0100 +++ debhelper-debian-10.10.9/Makefile 2021-03-16 15:28:10.188324493 +0100 @@ -56,14 +56,8 @@ - + POD2MAN_FLAGS=--utf8 -c Debhelper -r "$(VERSION)" - + -ifneq ($(USE_NLS),no) -# l10n to be built is determined from .po files -LANGS?=$(notdir $(basename $(wildcard man/po4a/po/*.po))) @@ -12,11 +12,12 @@ LANGS= LANG_TARGETS = -endif - - build: $(LANG_TARGETS) version debhelper.7 debhelper-obsolete-compat.7 $(MANPAGES) - -@@ -110,12 +104,6 @@ - + + build: $(LANG_TARGETS) version debhelper.7 debhelper-compat-upgrade-checklist.7 debhelper-obsolete-compat.7 $(MANPAGES) + + +@@ -113,12 +107,6 @@ + clean: rm -f *-stamp *.1 *.7 lib/Debian/Debhelper/Dh_Version.pm -ifneq ($(USE_NLS),no) @@ -25,6 +26,6 @@ - for lang in $(LANGS); do \ - if [ -e man/$$lang ]; then rmdir man/$$lang; fi; \ - done; - + install: install -d $(DESTDIR)$(PREFIX)/bin \ diff --git a/debhelper.changes b/debhelper.changes index 4da61c2..ad0982e 100644 --- a/debhelper.changes +++ b/debhelper.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Mon May 2 14:24:56 UTC 2022 - Jan Baier + +- Update to version 13.7 + * dh_installalternatives: Improve validation of alternative files to + catch some "obvious" copy-waste mistakes. + * dh: Invoke dh_installalternatives after dh_link in compat 14 or + later. Thanks to Colin Watson for the suggestion. + (Closes: #1002800) + * cmake.pm: Drop -DCMAKE_SKIP_RPATH=on in compat v14. Thanks to + Vagrant Cascadian for the suggestion and the investigative work on + this topic. (Closes: #1004939) + * debhelper-compat-upgrade-checklist.pod: New file. + * debhelper.pod: Move list of supported compat levels and the related + upgrade checklist into debhelper-compat-upgrade-checklist.pod. + This means you now need `man 7 debhelper-compat-upgrade-checklist` + to see the upgrade checklist. + * dh_installdebconf: Support -D/--define command line parameters + (mirroring those from dh_installdeb). + * Dh_Lib.pm: Cope with "?=" as assignment operator in substvars files + to be future proof with (possible) planned addition of "optional + substvars. At the moment, debhelper will still always use "=" when + adding a substvar but it will now preserve "?=" operator if an + existing substvar is modified. + * autoconf.pm: Add support for autotest test suites by passing the + TESTSUITEFLAGS environment variable to `make test`. + * Rewrite handling of stop services to use the `preinst` when using + --no-restart-after-upgrade. This fixes a regression caused by + the fix for #989155. (Closes: #994204) + * dh_installmenu: Respect DPKG_ROOT when checking for update-menus. + Note this implementation assumes update-menus is present both + inside and outside the chroot to activate. If it is absent on + either side, the update-menus call is skipped. + * dh_installsysusers: Invoke systemd-sysusers even when DPKG_ROOT + is set (relying on `--root`). + * dh_installpam: In compat 14, install pam snippets into + `/usr/lib/pam.d` instead of `/etc/pam.d`. Remember to remove + (now) obsolete conffiles when you bump to compat 14. + * debhelper.pod: Correct spelling of DEB_BUILD_MAINT_OPTIONS. + + ------------------------------------------------------------------- Mon Jan 3 10:46:23 UTC 2022 - Jan Baier diff --git a/debhelper.spec b/debhelper.spec index d0bf146..349a818 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -17,7 +17,7 @@ Name: debhelper -Version: 13.6 +Version: 13.7 Release: 0 Summary: Helper programs for debian/rules License: GPL-2.0-or-later From b6fa24c6885e5d6eafb75636ae95450268342a64b5eb070d970ad4eb91b71af6 Mon Sep 17 00:00:00 2001 From: Jan Baier Date: Mon, 2 May 2022 14:37:28 +0000 Subject: [PATCH 2/2] - Update to version 13.7.1 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/debhelper?expand=0&rev=19 --- debhelper-debian-13.7.1.tar.gz | 3 +++ debhelper-debian-13.7.tar.gz | 3 --- debhelper.changes | 12 ++++++++++++ debhelper.spec | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 debhelper-debian-13.7.1.tar.gz delete mode 100644 debhelper-debian-13.7.tar.gz diff --git a/debhelper-debian-13.7.1.tar.gz b/debhelper-debian-13.7.1.tar.gz new file mode 100644 index 0000000..fc4beb4 --- /dev/null +++ b/debhelper-debian-13.7.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6227704f1b27e1e82371e4b8910f2e99100e2a7aab3d3b3578178a512015c2f +size 1100859 diff --git a/debhelper-debian-13.7.tar.gz b/debhelper-debian-13.7.tar.gz deleted file mode 100644 index 8553b6d..0000000 --- a/debhelper-debian-13.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:725742a7bf899021c64cc36e6ba013f49f6caef0b06af686a07092a51d5688d9 -size 1100768 diff --git a/debhelper.changes b/debhelper.changes index ad0982e..006a854 100644 --- a/debhelper.changes +++ b/debhelper.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon May 2 14:33:58 UTC 2022 - Jan Baier + +- Update to version 13.7.1 + * debhelper.pod: Fix several typos. Thanks to Guillem Jover + for pointing them out and proposing corrections. + * dh_installalternatives: Correct a file check that caused + false-positive rejections of valid alternatives files. Thanks to + Hiroyuki YAMAMORI for reporting the bug and providing an initial + patch. (Closes: #1009844) + + ------------------------------------------------------------------- Mon May 2 14:24:56 UTC 2022 - Jan Baier diff --git a/debhelper.spec b/debhelper.spec index 349a818..6920889 100644 --- a/debhelper.spec +++ b/debhelper.spec @@ -17,7 +17,7 @@ Name: debhelper -Version: 13.7 +Version: 13.7.1 Release: 0 Summary: Helper programs for debian/rules License: GPL-2.0-or-later