[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit caccd12627234b394c4aa6f75826ec46faf40d92
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 7 02:01:34 2011 +0300

    Refresh patches.
---
 debian/changelog                                   |    1 +
 debian/patches/94_armv6_uname_entry.diff           |    6 +++---
 debian/patches/95_neon_flags.patch                 |    8 +++-----
 debian/patches/powerpcspe.diff                     |    2 +-
 debian/patches/sh.diff                             |    2 +-
 ...CC-intrinsics-for-armv6-atomic-operations.patch |    7 +------
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57aa5eb..afdacc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qt4-x11 (4:4.7.3-1) UNRELEASED; urgency=low
     avoid #606079, build depend >= g++ 4:4.5 on s390.
   * Bump Standards-Version to 3.9.2: no changes needed.
   * Drop blacklist_fraudulent_comodo_certificates.diff patch, upstream.
+  * Refresh patches.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 04 May 2011 13:08:38 +0300
 
diff --git a/debian/patches/94_armv6_uname_entry.diff b/debian/patches/94_armv6_uname_entry.diff
index f8f215b..4e53ac7 100644
--- a/debian/patches/94_armv6_uname_entry.diff
+++ b/debian/patches/94_armv6_uname_entry.diff
@@ -1,9 +1,9 @@
 Description: Add armv6 uname entry for armhf
 ---
 
---- a/configure	2011-03-10 15:25:58.000000000 +0200
-+++ b/configure	2011-03-11 10:40:13.837312856 +0200
-@@ -182,6 +182,9 @@
+--- a/configure
++++ b/configure
+@@ -182,6 +182,9 @@ case $DPKG_ARCH in
  	armel)
  		UNAME_MACHINE="armv5tel"
  	;;
diff --git a/debian/patches/95_neon_flags.patch b/debian/patches/95_neon_flags.patch
index 882ac22..46982ac 100644
--- a/debian/patches/95_neon_flags.patch
+++ b/debian/patches/95_neon_flags.patch
@@ -1,11 +1,9 @@
 ## Description: add some description
 ## Origin/Author: add some origin or author
 ## Bug: bug URL
-Index: qt4-x11-4.7.2/src/gui/gui.pro
-===================================================================
---- qt4-x11-4.7.2.orig/src/gui/gui.pro	2011-03-06 21:41:47.058276259 +0200
-+++ qt4-x11-4.7.2/src/gui/gui.pro	2011-03-06 21:38:16.569232507 +0200
-@@ -65,9 +65,9 @@
+--- a/src/gui/gui.pro
++++ b/src/gui/gui.pro
+@@ -65,9 +65,9 @@ symbian {
  neon:*-g++* {
      DEFINES += QT_HAVE_NEON
      HEADERS += $$NEON_HEADERS
diff --git a/debian/patches/powerpcspe.diff b/debian/patches/powerpcspe.diff
index 18385db..214efa3 100644
--- a/debian/patches/powerpcspe.diff
+++ b/debian/patches/powerpcspe.diff
@@ -7,7 +7,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3013,7 +3013,7 @@
+@@ -3013,7 +3013,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              CFG_HOST_ARCH=x86_64
          fi
          ;;
diff --git a/debian/patches/sh.diff b/debian/patches/sh.diff
index 94a4598..484faad 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -7,7 +7,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3053,6 +3053,12 @@
+@@ -3053,6 +3053,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              ;;
          esac
          ;;
diff --git a/debian/patches/x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch b/debian/patches/x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
index e7f7597..e5ca14d 100644
--- a/debian/patches/x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
+++ b/debian/patches/x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
@@ -7,11 +7,9 @@ Subject: [PATCH] Use GCC intrinsics for armv6 atomic operations
  src/corelib/arch/qatomic_armv6.h |  146 +++++++------------------------------
  1 files changed, 28 insertions(+), 118 deletions(-)
 
-diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h
-index 53f7907..7dfc002 100644
 --- a/src/corelib/arch/qatomic_armv6.h
 +++ b/src/corelib/arch/qatomic_armv6.h
-@@ -104,155 +104,65 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
+@@ -104,155 +104,65 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
  
  inline bool QBasicAtomicInt::ref()
  {
@@ -195,6 +193,3 @@ index 53f7907..7dfc002 100644
  }
  
  #else
--- 
-1.7.0.4
-

-- 
Qt 4 packaging