[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.7.0-5-5-g5944171
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Fri Oct 14 13:28:50 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=5944171
The following commit has been merged in the experimental branch:
commit 5944171822c4339406768feb39a03261a9e0f892
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Fri Oct 14 16:23:58 2016 +0300
Mark fix_tst_qqmlapplicationengine.diff as applied upstream.
---
debian/changelog | 2 ++
debian/patches/fix_tst_qqmlapplicationengine.diff | 5 ++---
debian/patches/series | 2 --
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f04e2a8..ef8d725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
qtdeclarative-opensource-src (5.7.0-6) UNRELEASED; urgency=medium
+ [ Dmitry Shachnev ]
+ * Mark fix_tst_qqmlapplicationengine.diff as applied upstream.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 14 Oct 2016 16:22:14 +0300
diff --git a/debian/patches/fix_tst_qqmlapplicationengine.diff b/debian/patches/fix_tst_qqmlapplicationengine.diff
index ebe75bc..c79bc6f 100644
--- a/debian/patches/fix_tst_qqmlapplicationengine.diff
+++ b/debian/patches/fix_tst_qqmlapplicationengine.diff
@@ -1,9 +1,8 @@
Description: make tst_qqmlapplicationengine pass when JIT is not available
When the platform does not have JIT, a warning about this is printed
into the process stderr, so the test fails.
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: https://codereview.qt-project.org/172606
-Last-Update: 2016-10-05
+Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=650b5db06b057abe
+Last-Update: 2016-10-14
--- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
+++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
diff --git a/debian/patches/series b/debian/patches/series
index a3ababe..6f90d6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,8 +5,6 @@ fix_engine_64bits_big_endian.diff
fix-V4-on-big-endian.patch
use_49_address_bits.diff
yarr_arm64.diff
-
-# Forwarded upstream
fix_tst_qqmlapplicationengine.diff
# Debian patches
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list