[Pkg-kde-commits] rev 1299 - trunk/packages/qt-x11-free/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-07-13 22:18:21 +0000 (Wed, 13 Jul 2005)
New Revision: 1299

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/rules
Log:
* Overhaul arch detection in debian/rules:
  - use DEB_HOST_ARCH instead of DEB_BUILD_GNU_CPU to detect arm.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-07-13 18:43:58 UTC (rev 1298)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-07-13 22:18:21 UTC (rev 1299)
@@ -35,6 +35,9 @@
       - adjust the list of *-i386 ports to list only the non-dead ones.
       - don't build depend on type-handling.
 
+  * Overhaul arch detection in debian/rules:
+    - use DEB_HOST_ARCH instead of DEB_BUILD_GNU_CPU to detect arm.
+
   +++ Changes by Christopher Martin:
 
   * Add sundry fixes from KDE's qt-copy. (Closes: #303065)

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2005-07-13 18:43:58 UTC (rev 1298)
+++ trunk/packages/qt-x11-free/debian/rules	2005-07-13 22:18:21 UTC (rev 1299)
@@ -11,10 +11,8 @@
 OLD_PATH := $(PATH)
 export PATH=$(QTDIR)/bin:$(OLD_PATH)
 
-DEB_BUILD_GNU_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_GNU_CPU   ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_ARCH    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # dpatch stuff
 include /usr/share/dpatch/dpatch.make
@@ -96,7 +94,7 @@
 	IBASE = -Nlibqt3c102-ibase -Nlibqt3c102-mt-ibase
 endif
 
-ifeq ($(DEB_BUILD_GNU_CPU),arm)
+ifeq ($(DEB_HOST_ARCH),arm)
 	CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
 endif