rev 7349 - in trunk/packages/qt4-x11/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-10-06 17:05:51 +0000 (Sat, 06 Oct 2007)
New Revision: 7349

Added:
   trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
use and trust dpkg-architecture instead of uname -m


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2007-10-06 16:58:04 UTC (rev 7348)
+++ trunk/packages/qt4-x11/debian/changelog	2007-10-06 17:05:51 UTC (rev 7349)
@@ -28,6 +28,8 @@
   [Sune Vuorela]
   * Have strict interdependencies between packages with a shlibs.local file
     (Closing: #438746)
+  * Don't trust uname in generating the qt build key. This has bitten us in
+    qt3, but will soon bite us in qt4 as qt4 becomes more popular.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 06 Oct 2007 07:00:54 +0200
 

Added: trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff	2007-10-06 17:05:51 UTC (rev 7349)
@@ -0,0 +1,52 @@
+author: Sune Vuorela
+Reported to trolltech as N180631 - and task 181882
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -93,7 +93,44 @@
+ #-------------------------------------------------------------------------------
+ 
+ # need that throughout the script
+-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
++DPKG_ARCH=`(dpkg-architecture -qDEB_HOST_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown
++case $DPKG_ARCH in 
++	amd64)
++		UNAME_MACHINE="x86_64"
++	;;
++	arm)
++		UNAME_MACHINE="armv4l"
++	;;
++	armel)
++		UNAME_MACHINE="armv5tel"
++	;;
++	hppa)
++		UNAME_MACHINE="parisc64"
++	;;
++	hurd-i386)
++		UNAME_MACHINE="i686-AT386"
++	;;
++	i386)
++		UNAME_MACHINE="i686"
++	;;
++	kfreebsd-amd64)
++		UNAME_MACHINE="x86_64"
++	;;
++	kfreebsd-i386)
++		UNAME_MACHINE="i586"
++	;;
++	mipsel)
++		UNAME_MACHINE="mips"
++	;;
++	powerpc)
++		UNAME_MACHINE="ppc"
++	;;
++	*)
++		UNAME_MACHINE="$DPKG_ARCH"
++	;;
++
++
++esac
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2007-10-06 16:58:04 UTC (rev 7348)
+++ trunk/packages/qt4-x11/debian/patches/series	2007-10-06 17:05:51 UTC (rev 7349)
@@ -1,4 +1,5 @@
 # qt-copy patches
+07_trust_dpkg-arch_over_uname-m.diff
 0163-fix-gcc43-support.diff
 0167-fix-group-reading.diff
 0175-fix-s390-qatomic.diff