diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 07:50:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 07:50:54 +0000 |
| commit | a1a6529bb9e4b3546d10ef3ee1a7f7205d5fa0df (patch) | |
| tree | c2e9bb5210bec43d07aae1fbaf9228b112814c29 | |
| parent | Merging upstream version 0.14. (diff) | |
| download | package-notes-a1a6529bb9e4b3546d10ef3ee1a7f7205d5fa0df.tar.xz package-notes-a1a6529bb9e4b3546d10ef3ee1a7f7205d5fa0df.zip | |
Merging debian version 0.14.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/package-notes.mk | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index f27025c..dcb4c1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +package-notes (0.14) unstable; urgency=medium + + * d/package-notes.mk: change to no-op on Ubuntu + + -- Luca Boccassi <bluca@debian.org> Sun, 23 Jun 2024 17:18:48 +0100 + package-notes (0.13-0.0~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/package-notes.mk b/debian/package-notes.mk index 2cb1339..dc2c705 100644 --- a/debian/package-notes.mk +++ b/debian/package-notes.mk @@ -4,16 +4,14 @@ # llvm does not support spec files ifeq ( ,$(filter lld, $(LD))) +# Ubuntu implemented this in dpkg-buildpackage, make this a no-op to avoid duplication +include /usr/share/dpkg/vendor.mk +ifneq ($(DEB_VENDOR),Ubuntu) # binutils 2.39 is required for --package-metadata= ifeq (0, $(shell dpkg --compare-versions $$(dpkg-query -f '$${Version}' -W binutils) ge 2.39; echo $$?)) -include /usr/share/dpkg/vendor.mk ifeq (, $(filter nocheck, $(DEBUGINFOD_URLS))) -ifeq ($(DEB_VENDOR),Ubuntu) -export DEBUGINFOD_URLS=https://debuginfod.ubuntu.com -else export DEBUGINFOD_URLS=https://debuginfod.debian.net endif -endif export DEB_SOURCE_PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version) export DEB_SOURCE_PACKAGE_NAME=$(shell dpkg-parsechangelog -S Source) # Set by /usr/share/dpkg/vendor.mk @@ -21,4 +19,5 @@ export DEB_VENDOR export DEB_LDFLAGS_MAINT_APPEND+= -specs=/usr/share/debhelper/dh_package_notes/debian-package-notes.specs endif endif +endif |