[SCM] qtbase packaging branch, experimental, updated. debian/5.2.1+dfsg-3-20-ge474fbb

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=e474fbb

The following commit has been merged in the experimental branch:
commit e474fbb4b01949b9236e4afbe81c24110aac246b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 20 01:08:51 2014 -0300

    Remove enable_s390_detection.patch, applied upstream.
---
 debian/changelog                           |  4 +++-
 debian/patches/enable_s390_detection.patch | 27 ---------------------------
 debian/patches/series                      |  1 -
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e228d6..1334382 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,9 @@ qtbase-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium
     - hurd_opengl_incldir.diff
     - support_mips_atomic_on_pre-mips32_archs.patch
     - qatomic_mips.h
-  * Remove fix_power_atomic_code.patch, the code it patches has been removed.
+  * Remove patches:
+    - fix_power_atomic_code.patch, the code it patches has been removed.
+    - enable_s390_detection.patch, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Mar 2014 10:10:09 -0300
 
diff --git a/debian/patches/enable_s390_detection.patch b/debian/patches/enable_s390_detection.patch
deleted file mode 100644
index 6b61633..0000000
--- a/debian/patches/enable_s390_detection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: enable s390[x] processor detection
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Forwarded: https://codereview.qt-project.org/#change,74514
-
-diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
-index 623e30a..dde8db0 100644
---- a/src/corelib/global/qprocessordetection.h
-+++ b/src/corelib/global/qprocessordetection.h
-@@ -267,12 +267,12 @@
- 
-     S390 is big-endian.
- */
--// #elif defined(__s390__)
--// #  define Q_PROCESSOR_S390
--// #  if defined(__s390x__)
--// #    define Q_PROCESSOR_S390_X
--// #  endif
--// #  define Q_BYTE_ORDER Q_BIG_ENDIAN
-+#elif defined(__s390__)
-+#  define Q_PROCESSOR_S390
-+#  if defined(__s390x__)
-+#    define Q_PROCESSOR_S390_X
-+#  endif
-+#  define Q_BYTE_ORDER Q_BIG_ENDIAN
- 
- /*
-     SuperH family, optional revision: SH-4A
diff --git a/debian/patches/series b/debian/patches/series
index 4b77cce..d888742 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ hurd_opengl_incldir.diff
 support_mips_atomic_on_pre-mips32_archs.patch
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
-enable_s390_detection.patch
 enable_sparc_detection.patch
 do_not_pass_wcast-align_on_sparc.patch
 

-- 
qtbase packaging