[SCM] qtscript packaging branch, kubuntu_unstable, updated. debian/5.4.1+dfsg-3-4-g2c02cf8

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 2c02cf8019fa16971b419327bbcf8fb3dad46360
Author: Rohan Garg <rohan at garg.io>
Date:   Sat Mar 28 00:24:49 2015 +0100

    Drop ppc64el_jscore.diff, applied upstream
---
 debian/changelog                   |  6 ++++++
 debian/patches/ppc64el_jscore.diff | 25 -------------------------
 debian/patches/series              |  1 -
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1d5f70..78d03de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtscript-opensource-src (5.4.1+dfsg-3) UNRELEASED; urgency=medium
+
+  * Drop ppc64el_jscore.diff, applied upstream
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 28 Mar 2015 00:24:17 +0100
+
 qtscript-opensource-src (5.4.1+dfsg-3) experimental; urgency=medium
 
   * Add upstream patch to correctly detect little-endian ppc/ppc64.
diff --git a/debian/patches/ppc64el_jscore.diff b/debian/patches/ppc64el_jscore.diff
deleted file mode 100644
index 9a42a2d..0000000
--- a/debian/patches/ppc64el_jscore.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: detect ppc64el architecture correctly
-Origin: upstream, http://code.qt.io/cgit/qt/qtscript.git/commit?id=822df36f252c5a16
-Last-Update: 2015-03-01
-
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -190,14 +190,18 @@
-     || defined(_M_PPC)      \
-     || defined(__PPC)
- #define WTF_CPU_PPC 1
-+#ifndef __LITTLE_ENDIAN__
- #define WTF_CPU_BIG_ENDIAN 1
-+#endif
- #endif
- 
- /* CPU(PPC64) - PowerPC 64-bit */
- #if   defined(__ppc64__) \
-     || defined(__PPC64__)
- #define WTF_CPU_PPC64 1
-+#ifndef __LITTLE_ENDIAN__
- #define WTF_CPU_BIG_ENDIAN 1
-+#endif
- #endif
- 
- /* CPU(SH4) - SuperH SH-4 */
diff --git a/debian/patches/series b/debian/patches/series
index 43be800..a7faf2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ enable-make-check.patch
 disable_failing_tests.diff
 disable_v8_sunspider_tests.patch
 s390x_jscore.diff
-ppc64el_jscore.diff

-- 
qtscript packaging