[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-18-gb7b6d00

[Pino Toscano]

The following commit has been merged in the master branch:
commit b7b6d0003628d0004c60dc51a9eaa4cbf73ebda9
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 20 11:01:08 2011 +0200

    drop patch s390.diff, already provided upstream
    
    adapt changelog consequently
---
 debian/changelog         |    2 +-
 debian/patches/s390.diff |   36 ------------------------------------
 debian/patches/series    |    1 -
 3 files changed, 1 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1193106..be040c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,12 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
 
   * New upstream release:
     - include 0001_fix_symbols_visibility_for_webcore.diff - stolen upstream.
+    - provides support for s390/s390x. (Closes: #637004)
 
   [ Pino Toscano ]
   * Use wildcard architectures: (Closes: #634388)
     - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
     - kfreebsd-i386 kfreebsd-amd64 hurd-i386 -> !linux-any
-  * Add patch s390.diff from upstream to support s390x. (Closes: #637004)
   * Patch 05_sparc_unaligned_access.diff: reduce unneeded changes.
   * Add -gstabs to the C(XX)FLAGS also for s390x. (see #637004)
 
diff --git a/debian/patches/s390.diff b/debian/patches/s390.diff
deleted file mode 100644
index 21669ff..0000000
--- a/debian/patches/s390.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Add support for s390/s390x architectures
-Author: Dan Horák <dan at danny.cz>
-Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+)
-Forwarded: no
-Last-Update: 2011-08-06
-
---- a/Source/JavaScriptCore/wtf/Platform.h
-+++ b/Source/JavaScriptCore/wtf/Platform.h
-@@ -186,6 +186,18 @@
- #define WTF_CPU_SPARC 1
- #endif
-
-+/* CPU(S390X) - S390 64-bit */
-+#if defined(__s390x__)
-+#define WTF_CPU_S390X 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+
-+/* CPU(S390) - S390 32-bit */
-+#if defined(__s390__)
-+#define WTF_CPU_S390 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+
- /* CPU(X86) - i386 / x86 32-bit */
- #if   defined(__i386__) \
-     || defined(i386)     \
-@@ -917,6 +929,7 @@
- #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
-     || (CPU(IA64) && !CPU(IA64_32)) \
-     || CPU(ALPHA) \
-+    || CPU(S390X) \
-     || CPU(SPARC64)
- #define WTF_USE_JSVALUE64 1
- #elif CPU(ARM_TRADITIONAL) || CPU(PPC64) || CPU(MIPS)
-
diff --git a/debian/patches/series b/debian/patches/series
index afbdf4c..4c9ba1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,3 @@ stabs_format_debug_info.diff
 09_hurd.diff
 #linux_amd64_no_overcommit.diff
 defines_qt_webkit.diff
-#s390.diff

-- 
QtWebKit packaging