[SCM] qtscript packaging branch, experimental, updated. debian/5.4.1+dfsg-3-7-gc206c60

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Tue Jun 2 19:29:24 UTC 2015


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

The following commit has been merged in the experimental branch:
commit c206c60745ed91a7d98cd5320ffc4f4a20bdf37d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jun 2 16:29:05 2015 -0300

    Remove ppc64el_jscore.diff.
    
    Applied upstream.
---
 debian/changelog                   |  1 +
 debian/patches/ppc64el_jscore.diff | 25 -------------------------
 debian/patches/series              |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9e6ef1..d8bba7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtscript-opensource-src (5.4.2+dfsg-1) UNRELEASED; urgency=medium
     (and we really hope to see you back really soon!).
   * Update symbols files with buildds' logs.
   * Refresh s390x_jscore.diff.
+  * Remove ppc64el_jscore.diff, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 May 2015 20:52:28 -0300
 
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



More information about the pkg-kde-commits mailing list