[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#311158: marked as done (busybox-cvs: support for dpkg 1.13)

Your message dated Sun, 12 Apr 2009 13:28:19 +0200
with message-id <20090412112819.GC13710@wavehammer.waldi.eu.org>
and subject line superseeded
has caused the Debian Bug report #311158,
regarding busybox-cvs: support for dpkg 1.13
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
311158: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=311158
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
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                                       [cjwatson@debian.org]

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)

--- End Message ---
--- Begin Message --- 
The bug was fixed another way.

Bastian

-- 
There is a multi-legged creature crawling on your shoulder.
		-- Spock, "A Taste of Armageddon", stardate 3193.9

--- End Message ---
Reply to: