[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.7.1-20161021-5-126-g25e4dd3
Timo Jyrinki
timo at moszumanska.debian.org
Thu Nov 10 14:29:50 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=25e4dd3
The following commit has been merged in the ubuntu+1 branch:
commit 25e4dd3e336971f8cd9cf3c750176d2f3964ff69
Merge: 649122bfae62739bb19fa6e7c29b6af45f5128eb fb1bc564f48f0863eae6ee8d7666495fb0d5443d
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Thu Nov 10 14:29:43 2016 +0000
Merge branch 'master' into ubuntu+1
debian/changelog | 120 ++++--
debian/control | 33 +-
debian/copyright | 8 +-
debian/patches/disableopengltests.patch | 13 +-
...-Value-tags-types.patch => fix_tags_types.diff} | 64 +---
debian/patches/fix_test_remove_qlibraryinfo.patch | 82 ++--
debian/patches/fix_tst_qqmlapplicationengine.diff | 17 +
debian/patches/revert_c9ffed92.diff | 421 +++++++++++++++++++++
debian/patches/series | 3 +
debian/rules | 8 +-
10 files changed, 624 insertions(+), 145 deletions(-)
diff --cc debian/changelog
index 6138158,8af81c9..2384858
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,97 +1,114 @@@
- qtdeclarative-opensource-src (5.7.0-2ubuntu1) UNRELEASED; urgency=medium
++qtdeclarative-opensource-src (5.7.1~20161021-5ubuntu1) UNRELEASED; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Merge 5.6.1-7 from unstable.
+
+ [ Timo Jyrinki ]
+ * New upstream release.
+ * Drop patches now in upstream.
+ * Rebase patches to apply to 5.7:
+ - debian/patches/Fix-visibility-of-properties-in-value-types.patch
+ - debian/patches/disable_failing_tests.patch
+ - debian/patches/fix_binary_location_for_tests.patch
+ * Rebase QML cache patch for 5.7 and add arm64 support.
+ * Update symbols and mark private ones.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Wed, 07 Sep 2016 13:12:08 +0000
+
+ qtdeclarative-opensource-src (5.7.1~20161021-5) unstable; urgency=medium
+
+ * Revert upstream commit c9ffed92a0dee0ae, which broke Qt Quick Controls.
+ Update the symbols files accordingly. Closes: #843250.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 06 Nov 2016 17:01:42 +0300
+
+ qtdeclarative-opensource-src (5.7.1~20161021-4) unstable; urgency=medium
+
+ * Update symbols files with buildds' logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Thu, 03 Nov 2016 11:51:14 -0300
+
+ qtdeclarative-opensource-src (5.7.1~20161021-3) unstable; urgency=medium
+
+ * Update symbols files from buildds’ logs.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 01 Nov 2016 14:53:44 +0300
+
+ qtdeclarative-opensource-src (5.7.1~20161021-2) experimental; urgency=medium
+
+ * Make tests non-fatal. We enabled test on the 5.7 round and discovered
+ that some of them where failing. As Dmitry Shachnev discovered this is no
+ regresion from 5.6 and we need to get 5.7 into testing before the
+ transition freeze we are making them non-fatal.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Sat, 29 Oct 2016 23:00:31 -0300
+
+ qtdeclarative-opensource-src (5.7.1~20161021-1) experimental; urgency=medium
+
+ * New upstream snapshot.
+ * Drop the following patches, applied upstream:
+ - no_lifetime_dse.diff
+ - no_value_without_tag.diff
+ - fix_engine_64bits_big_endian.diff
+ - fix-V4-on-big-endian.patch
+ - use_49_address_bits.diff
+ - yarr_arm64.diff
+ * Refresh other patches.
+ * Bump Qt build-dependencies to 5.7.1~20161021.
+ * Update symbols files from buildds’ logs and from current amd64 build log.
+ * Update debian/copyright for file moves.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 25 Oct 2016 10:45:32 +0300
+
+ qtdeclarative-opensource-src (5.7.0-7) experimental; urgency=medium
+
+ * Backport upstream patch to fix usage of QV4::Value tags/types
+ (fix_tags_types.diff).
+ * Re-enable qqmldebugjs test, it seems to pass now.
+ * Migrate to automatic dbgsym packages.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 18 Oct 2016 19:38:54 +0300
+
+ qtdeclarative-opensource-src (5.7.0-6) experimental; urgency=medium
+
+ * Mark fix_tst_qqmlapplicationengine.diff as applied upstream.
+ * Update symbols files from buildds’ logs.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 14 Oct 2016 16:39:48 +0300
+
+ qtdeclarative-opensource-src (5.7.0-5) experimental; urgency=medium
+
+ * Backport upstream patch to fix crashes on arm64 (yarr_arm64.diff).
+ * Update symbols files from buildds’ logs.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 07 Oct 2016 00:00:25 +0300
+
+ qtdeclarative-opensource-src (5.7.0-4) experimental; urgency=medium
+
+ * Backport upstream patch to remove setTag() and setValue() methods, and
+ leave only setTagValue() (no_value_without_tag.diff). Without this patch
+ the current version of fix_engine_64bits_big_endian.diff did not make
+ any sense.
+ * Rebase fix_engine_64bits_big_endian.diff and fix-V4-on-big-endian.patch
+ on top of the above patch.
+ * Add a patch to make the qqmlapplicationengine test pass when JIT is not
+ available (fix_tst_qqmlapplicationengine.diff, forwarded upstream).
+ * Backport upstream patch to allow using 49 address bits in 64-bit mode
+ (use_49_address_bits.diff). This should fix issues on arm64.
+ * Update symbols files from amd64 build log.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 06 Oct 2016 08:27:43 +0300
+
+ qtdeclarative-opensource-src (5.7.0-3) experimental; urgency=medium
+
+ * Merge 5.6.1-10 from unstable.
+ * Run make check with -k flag to get as much output as possible.
+ * Refresh the patches.
+ * Update symbols files from amd64 build log.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 02 Oct 2016 10:12:58 +0300
+
qtdeclarative-opensource-src (5.7.0-2) experimental; urgency=medium
* Merge 5.6.1-5 from unstable; replace fix_engine_64bits_big_endian.diff
@@@ -45,48 -122,6 +139,24 @@@ qtdeclarative-opensource-src (5.7.0-1)
-- Dmitry Shachnev <mitya57 at debian.org> Tue, 05 Jul 2016 15:53:55 +0300
- qtdeclarative-opensource-src (5.6.1-7) unstable; urgency=medium
-
- * Update libqt5qml5.symbols from buildds’ logs.
-
- -- Dmitry Shachnev <mitya57 at debian.org> Tue, 30 Aug 2016 14:00:17 +0300
-
- qtdeclarative-opensource-src (5.6.1-6) unstable; urgency=medium
-
- * Backport upstream change to fix crashes when compiled with GCC 6
- (no_lifetime_dse.diff; see QTBUG-55482).
- * Update symbols files from buildds’ logs.
-
- -- Dmitry Shachnev <mitya57 at debian.org> Mon, 29 Aug 2016 21:30:47 +0300
-
- qtdeclarative-opensource-src (5.6.1-5) unstable; urgency=medium
-
- [ Lisandro Damián Nicanor Pérez Meyer ]
- * Update symbols files with buildds' logs (Closes: #830817).
-
- [ Maximiliano Curia ]
- * Add new patch: fix_engine_64bits_big_endian.diff
-
- -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Tue, 19 Jul 2016 12:09:46 -0300
-
+qtdeclarative-opensource-src (5.6.2-0ubuntu1) UNRELEASED; urgency=medium
+
+ * 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.
+ * New usptream version 5.6.2.
+ * Drop patches merged upstream:
+ - 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
+ - Flickable-fix-minXExtent-minYExtent-when-content-is-.patch
+ - QQuickWindow-Fill-out-timestamps-in-QHoverEvents-sen.patch
+ - Revert-Remove-this-piece-of-code.patch
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 06 Oct 2016 14:39:07 +0000
+
qtdeclarative-opensource-src (5.6.1-11) unstable; urgency=medium
* Run make check with -k flag to get as much output as possible.
diff --cc debian/patches/series
index 170859c,0ec9bcb..ce64a82
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,10 -1,8 +1,13 @@@
# Backported patches
+Fix-visibility-of-properties-in-value-types.patch
+ fix_tst_qqmlapplicationengine.diff
+ fix_tags_types.diff
# Debian patches
disableopengltests.patch
fix_test_remove_qlibraryinfo.patch
+ revert_c9ffed92.diff
+
+# Ubuntu patches
+QML-Compilation-unit-caching-and-JIT-changes.patch
+skip_failing_i386_test.patch
diff --cc debian/rules
index 74f0486,58ea3ae..11dc590
--- a/debian/rules
+++ b/debian/rules
@@@ -66,18 -64,19 +66,22 @@@ override_dh_link
done
override_dh_makeshlibs:
- dh_makeshlibs -V
+ # On Ubuntu no -V due to -gles twin packages
+ dh_makeshlibs
override_dh_auto_test-arch:
+ifneq ("$(DEB_HOST_ARCH)$(DEB_HOST_SERIES)","ppc64elxenial")
$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
mkdir -p $(CURDIR)/.local/share/QtProject/tst_qqmlengine
- xvfb-run -a \
+ # Make the tests non-fatal, see the 5.7.1~20161021-2 changelog.
+ -xvfb-run -a \
-s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
dh_auto_test --max-parallel=1 -- -k -Ctests/auto \
QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
HOME=$(CURDIR) LD_LIBRARY_PATH=$(CURDIR)/lib
+endif
override_dh_auto_test-indep:
+
+ override_dh_strip:
+ dh_strip --dbgsym-migration='qtdeclarative5-dbg (<< 5.7.0-7~)'
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list