Package: busybox-cvs Version: 20040623-1 Severity: wishlist Tags: patch Please apply the attached patch to support dpkg 1.13, which prints different output for the DEB_HOST_GNU_* variables from dpkg-architecture. The new variables are those recommended in the changelog.
Thanks, -- Colin Watson [EMAIL PROTECTED]
diff -u busybox-cvs-20040623/debian/rules busybox-cvs-20040623/debian/rules --- busybox-cvs-20040623/debian/rules +++ busybox-cvs-20040623/debian/rules @@ -4,8 +4,8 @@ #export DH_VERBOSE=1 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) -DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null || dpkg-architecture -qDEB_HOST_GNU_SYSTEM) VERSION = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) EXTRA_VERSION = Debian $(VERSION) @@ -31,7 +31,7 @@ DEBHELPER_PACKAGES_DEB = $(patsubst %,-p%,$(PACKAGES_DEB)) DEBHELPER_PACKAGES_UDEB = $(patsubst %,-p%,$(PACKAGES_UDEB)) -CONFIG = $(firstword $(wildcard ./debian/config-$(1)-$(DEB_HOST_GNU_SYSTEM)-$(DEB_HOST_GNU_CPU) ./debian/config-$(1)-$(DEB_HOST_GNU_SYSTEM) ./debian/config-$(1))) +CONFIG = $(firstword $(wildcard ./debian/config-$(1)-$(DEB_HOST_ARCH_OS)-$(DEB_HOST_ARCH_CPU) ./debian/config-$(1)-$(DEB_HOST_ARCH_OS) ./debian/config-$(1))) CONFIG_DEB = $(call CONFIG,deb) CONFIG_STATIC = $(call CONFIG,static) CONFIG_UDEB = $(call CONFIG,udeb)
