[SCM] qtdeclarative packaging branch, ubuntu, updated. debian/5.6.1-11-110-gead8207

Timo Jyrinki timo at moszumanska.debian.org
Mon Nov 7 09:48:03 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit ead82076a854a31273f1e6093456911dbd0539c3
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Nov 7 09:47:24 2016 +0000

    Comment out arm64 related patches that did not fix all issues on the different kernel config.
---
 debian/changelog      | 5 -----
 debian/patches/series | 6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5587a1..8e8a802 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,9 @@
 qtdeclarative-opensource-src (5.6.1-11ubuntu1) UNRELEASED; urgency=medium
 
-  * debian/patches/V4-Free-up-2-address-bits-in-64bit-mode.patch:
-    Add-a-facility-to-version-type-information-for-debug.patch
-    - Upstream suggested update for arm64 (LP: #1630906)
   * Update symbols.
   * Merge with Debian 5.6.1-11 changes.
   * Use fix-V4-on-big-endian.patch version from upstream 5.6 branch.
   * Skip certain failing tests on i386 and ppc64el tests on xenial.
-  * Add debian/patches/V4-Fix-usage-of-QV4-Value-tags-types.patch also 
-    recommended by upstream.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 06 Oct 2016 14:39:07 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index 8357a42..df2eb4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,14 +4,14 @@ qml_only_release_types_if_they_arent_referenced_anymore.patch
 no_lifetime_dse.diff
 V4-Always-set-the-tag-when-boxing-a-pointer-in-QV4-V.patch
 Fix-QQmlEngine-crash-on-big-endian-64-bit-architectu.patch
-Add-a-facility-to-version-type-information-for-debug.patch
-V4-Free-up-2-address-bits-in-64bit-mode.patch
+#Add-a-facility-to-version-type-information-for-debug.patch
+#V4-Free-up-2-address-bits-in-64bit-mode.patch
 fix-V4-on-big-endian.patch
 Flickable-fix-minXExtent-minYExtent-when-content-is-.patch
 QQuickWindow-Fill-out-timestamps-in-QHoverEvents-sen.patch
 Fix-visibility-of-properties-in-value-types.patch
 Revert-Remove-this-piece-of-code.patch
-V4-Fix-usage-of-QV4-Value-tags-types.patch
+#V4-Fix-usage-of-QV4-Value-tags-types.patch
 
 # Debian patches
 check_system_double-conversion.patch

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list