Skip to content

Commit bec3aa8

Browse files
committed
d/package-notes.mk: change to no-op on Ubuntu
It was implemented in dpkg-buildpackage itself, so skip the explicit helper to avoid duplication
1 parent 55f719b commit bec3aa8

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

debian/package-notes.mk

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@
44

55
# llvm does not support spec files
66
ifeq ( ,$(filter lld, $(LD)))
7+
# Ubuntu implemented this in dpkg-buildpackage, make this a no-op to avoid duplication
8+
include /usr/share/dpkg/vendor.mk
9+
ifneq ($(DEB_VENDOR),Ubuntu)
710
# binutils 2.39 is required for --package-metadata=
811
ifeq (0, $(shell dpkg --compare-versions $$(dpkg-query -f '$${Version}' -W binutils) ge 2.39; echo $$?))
9-
include /usr/share/dpkg/vendor.mk
1012
ifeq (, $(filter nocheck, $(DEBUGINFOD_URLS)))
11-
ifeq ($(DEB_VENDOR),Ubuntu)
12-
export DEBUGINFOD_URLS=https://debuginfod.ubuntu.com
13-
else
1413
export DEBUGINFOD_URLS=https://debuginfod.debian.net
1514
endif
16-
endif
1715
export DEB_SOURCE_PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version)
1816
export DEB_SOURCE_PACKAGE_NAME=$(shell dpkg-parsechangelog -S Source)
1917
# Set by /usr/share/dpkg/vendor.mk
2018
export DEB_VENDOR
2119
export DEB_LDFLAGS_MAINT_APPEND+= -specs=/usr/share/debhelper/dh_package_notes/debian-package-notes.specs
2220
endif
2321
endif
22+
endif
2423

0 commit comments

Comments
 (0)