The following commit has been merged in the sid branch:
commit 9cc83ca6ff8de35c114d83f7307f1f7cbcd3704f
Author: Raphaël Hertzog <[email protected]>
Date:   Sat Oct 15 10:53:38 2011 +0200

    scripts/mk: fix typo to correctly set DEB_*_ARCH_BITS in architecture.mk

diff --git a/debian/changelog b/debian/changelog
index 86ff87e..7766c68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dpkg (1.16.1.2) UNRELEASED; urgency=low
+
+  * Fix another typo to correctly set DEB_*_ARCH_BITS in architecture.mk.
+
+ -- Raphaël Hertzog <[email protected]>  Sat, 15 Oct 2011 10:49:21 +0200
+
 dpkg (1.16.1.1) unstable; urgency=low
 
   [ Raphaël Hertzog ]
diff --git a/scripts/mk/architecture.mk b/scripts/mk/architecture.mk
index 56eaabe..84fe1d6 100644
--- a/scripts/mk/architecture.mk
+++ b/scripts/mk/architecture.mk
@@ -7,7 +7,7 @@ dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval 
DPKG_CACHE_$(1) := $(shel
 DEB_HOST_ARCH ?= $(call dpkg_late_eval,DEB_HOST_ARCH,dpkg-architecture 
-qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS ?= $(call dpkg_late_eval,DEB_HOST_ARCH_OS,dpkg-architecture 
-qDEB_HOST_ARCH_OS)
 DEB_HOST_ARCH_CPU ?= $(call dpkg_late_eval,DEB_HOST_ARCH_CPU,dpkg-architecture 
-qDEB_HOST_ARCH_CPU)
-DEB_HOST_ARCH_BITS ?= $(call dpkg_late_eval,DEB_HOST_ARCH,dpkg-architecture 
-qDEB_HOST_ARCH_BITS)
+DEB_HOST_ARCH_BITS ?= $(call 
dpkg_late_eval,DEB_HOST_ARCH_BITS,dpkg-architecture -qDEB_HOST_ARCH_BITS)
 DEB_HOST_ARCH_ENDIAN ?= $(call 
dpkg_late_eval,DEB_HOST_ARCH_ENDIAN,dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
 DEB_HOST_GNU_CPU ?= $(call dpkg_late_eval,DEB_HOST_GNU_CPU,dpkg-architecture 
-qDEB_HOST_GNU_CPU)
 DEB_HOST_GNU_SYSTEM ?= $(call 
dpkg_late_eval,DEB_HOST_GNU_SYSTEM,dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
@@ -17,7 +17,7 @@ DEB_HOST_MULTIARCH ?= $(call 
dpkg_late_eval,DEB_HOST_MULTIARCH,dpkg-architecture
 DEB_BUILD_ARCH ?= $(call dpkg_late_eval,DEB_BUILD_ARCH,dpkg-architecture 
-qDEB_BUILD_ARCH)
 DEB_BUILD_ARCH_OS ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_OS,dpkg-architecture 
-qDEB_BUILD_ARCH_OS)
 DEB_BUILD_ARCH_CPU ?= $(call 
dpkg_late_eval,DEB_BUILD_ARCH_CPU,dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-DEB_BUILD_ARCH_BITS ?= $(call dpkg_late_eval,DEB_BUILD_ARCH,dpkg-architecture 
-qDEB_BUILD_ARCH_BITS)
+DEB_BUILD_ARCH_BITS ?= $(call 
dpkg_late_eval,DEB_BUILD_ARCH_BITS,dpkg-architecture -qDEB_BUILD_ARCH_BITS)
 DEB_BUILD_ARCH_ENDIAN ?= $(call 
dpkg_late_eval,DEB_BUILD_ARCH_ENDIAN,dpkg-architecture -qDEB_BUILD_ARCH_ENDIAN)
 DEB_BUILD_GNU_CPU ?= $(call dpkg_late_eval,DEB_BUILD_GNU_CPU,dpkg-architecture 
-qDEB_BUILD_GNU_CPU)
 DEB_BUILD_GNU_SYSTEM ?= $(call 
dpkg_late_eval,DEB_BUILD_GNU_SYSTEM,dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to