rev 13359 - in branches/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-01-15 10:56:58 +0000 (Thu, 15 Jan 2009)
New Revision: 13359

Added:
   branches/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
Removed:
   branches/qt4-x11/debian/patches/20_mips_atomic_ops.diff
Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/patches/series
Log:
Re-add 07. Disabled for now, until clarification. Update related TODO.
Remove 20. Fixed upstream.


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2009-01-15 01:32:58 UTC (rev 13358)
+++ branches/qt4-x11/debian/changelog	2009-01-15 10:56:58 UTC (rev 13359)
@@ -16,10 +16,11 @@
   * Remove Debian patches:
     - 07_trust_dpkg-arch_over_uname-m.diff - Fixed upstream.
     - 12_fix_qmake_pkgconfig.diff
+    - 20_mips_atomic_ops.diff - Fixed upstream.
+      In memory of Thiemo Seufer.
+      Thanks for his invaluable help on MIPS. He will be missed.
   * Update Debian patches:
     - 02, 03, 04, 05, 09, 14, 15, 16, 17, 30, 40, 41, 50, 71, 80.
-    - 20_mips_atomic_ops.diff - In memory of Thiemo Seufer.
-      Thanks for his invaluable help on MIPS. He will be missed.
   * Add qt-copy patch:
     - 0265-fix-formlayoutcrash.diff
       Fix a crash in QFormLayout when a layout is alone in a row.
@@ -47,6 +48,10 @@
     - Add missing depends to libqt4-dev based on Qt build dependencies
   * what to do with phonon and webkit ?
     - webkit links against phonon.
+  * TT changed the build key generation and added backwards compability.
+    We need to re-add 07_trust_dpkg-arch_over_uname-m.diff patch for our
+    backward compability *and* figure out what to do with the new build key
+    generation.
 
  -- Fathi Boudra <fabo at debian.org>  Sat, 10 Jan 2009 19:54:09 +0100
 

Added: branches/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
===================================================================
--- branches/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff	                        (rev 0)
+++ branches/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff	2009-01-15 10:56:58 UTC (rev 13359)
@@ -0,0 +1,58 @@
+author: Sune Vuorela
+qt-bugs@ issue : N180631
+Trolltech task ID : 181882
+
+--- a/configure
++++ b/configure
+@@ -94,7 +94,50 @@ getQMakeConf()
+ #-------------------------------------------------------------------------------
+ 
+ # need that throughout the script
+-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
++# This is a ugly hack that shouldn't be extended any more. New archs
++# should just use the default *) UNAME_MACHINE="$DPKG_ARCH" The current mappings
++# is for backwards compatibility with existing archs already released.
++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"
++	;;
++	lpia)
++		UNAME_MACHINE="i686"
++	;;
++	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

Deleted: branches/qt4-x11/debian/patches/20_mips_atomic_ops.diff

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2009-01-15 01:32:58 UTC (rev 13358)
+++ branches/qt4-x11/debian/patches/series	2009-01-15 10:56:58 UTC (rev 13359)
@@ -17,6 +17,7 @@
 03_launch_moc-qt4.diff
 04_launch_uic-qt4.diff
 05_append_qt4_target.diff
+# Fixed upstream 07_trust_dpkg-arch_over_uname-m.diff
 09_qmake_lflags_as-needed.diff
 10_config_tests_fixes.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
@@ -24,7 +25,6 @@
 16_hide_std_symbols_on_qtwebkit.diff
 17_add_postgresql_8.3_support.diff
 18_enable_qt3support_qtwebkit_debug_info.diff
-20_mips_atomic_ops.diff
 30_webkit_unaligned_access.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff
@@ -33,4 +33,3 @@
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
 81_hurd_more_max_path.diff
-