[SCM] qtdeclarative packaging branch, ubuntu, updated. debian/5.5.0-2-31-gacf4e55
Timo Jyrinki
timo at moszumanska.debian.org
Wed Sep 9 08:26:39 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=57e3dcc
The following commit has been merged in the ubuntu branch:
commit 57e3dcca5b3e06336a4982ac94fbc65a8a8214ea
Merge: 471381521365063656b26bf2bd4ccb7977def725 fcfafdc1c042a7b0a7e3eaa9792fc07f2bf3dc6b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Wed Sep 9 07:35:01 2015 +0000
Merge branch 'experimental' into ubuntu
debian/changelog | 49 +++++++-
debian/control | 3 +-
debian/copyright | 129 ++++++++-------------
.../patches/check_system_double-conversion.patch | 126 ++++++++++++++++++++
debian/patches/series | 3 +
debian/rules | 12 ++
6 files changed, 239 insertions(+), 83 deletions(-)
diff --cc debian/changelog
index f8b2a13,6caeffa..a5623f6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,75 -1,60 +1,122 @@@
- qtdeclarative-opensource-src (5.5.0-0ubuntu1) UNRELEASED; urgency=medium
++qtdeclarative-opensource-src (5.5.0-2ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Remove patches no longer needed:
+ - debian/patches/High-dpi-SVG-and-QQuickImageProvider-Images.patch
+ - debian/patches/aarch64.patch
+ - debian/patches/check_system_double-conversion.patch
+ - debian/patches/ppc64el.patch
+ * Rebase patches:
+ - debian/patches/Add-QQuickAsyncImageProvider.patch
+ - debian/patches/disable_failing_tests.patch
+ - debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
+ (LP: #1437320)
+ * Update .install files.
+ * Skip tests also on ppc64el, they are flaky.
+ * Update symbols and mark/unmark private ones.
+ * Bump ABI version to 5-5-0.
+ * Bump build dependencies.
+ * Build dep on libqt5xcbqpa5 to be able to run the tests under xvfb.
+ * Update Vcs url:s to Debian git.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 09 Jul 2015 11:02:34 +0000
+
+ qtdeclarative-opensource-src (5.5.0-2) experimental; urgency=medium
+
+ * Update symbols files with buildds’ logs.
+ * Symlink duplicate private headers in QtQml and QtQmlDevTools directories.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 22 Aug 2015 11:38:09 +0300
+
+ qtdeclarative-opensource-src (5.5.0-1) experimental; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Bump Qt build-dependencies to 5.5.0.
+ * Drop avoid_calling_potentially_pure-virtual_method.patch, applied upstream.
+ * Refresh check_system_double-conversion.patch.
+ * Update debian/copyright for the new version.
+ * Update symbols file for 5.5.0. There are some missing non-private symbols,
+ but they are not exposed in public APIs.
+ * Bump ABI version to 5-5-0.
+ * Mark new private symbols.
+
+ [ Timo Jyrinki ]
+ * Update .install files.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 15 Aug 2015 17:05:06 +0300
+
+ qtdeclarative-opensource-src (5.4.2-6) unstable; urgency=medium
+
+ * Update symbols files with buildds' logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Thu, 06 Aug 2015 12:13:38 -0300
+
+ qtdeclarative-opensource-src (5.4.2-5) unstable; urgency=medium
+
+ * Update symbols files with current build log against gcc5.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Wed, 05 Aug 2015 18:17:46 -0300
+
+ qtdeclarative-opensource-src (5.4.2-4) unstable; urgency=medium
+
+ * Backport avoid_calling_potentially_pure-virtual_method.patch to avoid
+ crashes. Thanks Diane for the hint!
+ * Update symbols files with buildds' logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Fri, 24 Jul 2015 14:08:32 -0300
+
+ qtdeclarative-opensource-src (5.4.2-3) unstable; urgency=medium
+
- * Update symbols files with buildds' logs.
+qtdeclarative-opensource-src (5.4.2-1ubuntu6) wily; urgency=medium
- -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Tue, 23 Jun 2015 16:05:25 -0300
+ * debian/patches/Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch
+ debian/patches/Fix-memory-leak-when-using-async-image-providers.patch:
+ - Fix memory leaks (LP: #1484914)
-qtdeclarative-opensource-src (5.4.2-2) unstable; urgency=medium
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Tue, 01 Sep 2015 12:02:43 +0000
- * Upload to unstable.
- * Update symbols files with buildds' logs.
+qtdeclarative-opensource-src (5.4.2-1ubuntu5) wily; urgency=medium
+
+ * debian/patches/Don-t-change-the-currentItem-after-a-viewport-resize.patch:
+ - Fix ListView's currentIndex changing when view is resized (LP: #1433442)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 13 Aug 2015 12:30:49 +0300
+
+qtdeclarative-opensource-src (5.4.2-1ubuntu4) wily; urgency=medium
+
+ * Rebuild for GCC5 transition.
+ * Update symbols.
- -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Tue, 23 Jun 2015 10:40:41 -0300
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Fri, 10 Jul 2015 09:24:02 +0300
+
+qtdeclarative-opensource-src (5.4.2-1ubuntu3) wily; urgency=medium
+
+ * debian/patches/Fix-implicitHeight-for-Text-items-bindings-dependent.patch:
+ - Fix character overlapping (LP: #1468403)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 16 Jul 2015 12:24:04 +0000
+
+qtdeclarative-opensource-src (5.4.2-1ubuntu2) wily; urgency=medium
+
+ * debian/patches/Add-QQuickAsyncImageProvider.patch:
+ - Fix segfault by importing https://codereview.qt-project.org/#/c/115522/
+ and https://codereview.qt-project.org/#/c/120638/
+ (LP: #1469611)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Wed, 08 Jul 2015 05:20:41 +0000
+
+qtdeclarative-opensource-src (5.4.2-1ubuntu1) wily; urgency=medium
+
+ * New upstream release.
+ * Drop patches merged upstream:
+ - Fix-regression-where-QQuickScreenAttached-overwrites.patch
+ - Fix-crash-in-overdraw-and-change-visualizers.patch
+ - Protect-the-RegExp-against-early-garbage-collection.patch
+ * Refresh Add-QQuickAsyncImageProvider.patch to apply
+ * Skip a few pixmapcache tests that fail on half of the builders
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 11 Jun 2015 05:01:53 +0000
qtdeclarative-opensource-src (5.4.2-1) experimental; urgency=medium
diff --cc debian/control
index 09b59d9,e44da6c..9c34542
--- a/debian/control
+++ b/debian/control
@@@ -14,10 -13,7 +14,9 @@@ Build-Depends: debhelper (>= 9)
libqt5xmlpatterns5-private-dev (>= 5.5.0~),
pkg-kde-tools (>= 0.15.17~),
python,
- qtbase5-private-dev (>= 5.5.0~),
- qtbase5-private-dev (>= 5.5.0+dfsg~)
++ qtbase5-private-dev (>= 5.5.0+dfsg~),
+ xauth,
+ xvfb
Standards-Version: 3.9.6
Homepage: http://qt-project.org/
Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtdeclarative.git
diff --cc debian/patches/series
index 7c7f5a5,9741485..bd2383c
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,2 +1,14 @@@
+# Backported patches
+Make-sure-we-stop-animators-if-they-are-yet-to-be-st.patch
+Add-QQuickAsyncImageProvider.patch
+Don-t-change-the-currentItem-after-a-viewport-resize.patch
+Fix-memory-leak-when-using-async-image-providers.patch
+Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch
+
+ # Debian patches
+ check_system_double-conversion.patch
++
+# Ubuntu patches
+fix_binary_location_for_tests.patch
+disable_failing_tests.patch
+QML-Compilation-unit-caching-and-JIT-changes.patch
diff --cc debian/rules
index 94339dc,12ee958..8cf12be
--- a/debian/rules
+++ b/debian/rules
@@@ -4,7 -4,7 +4,8 @@@
#export DH_VERBOSE=1
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ PRIVATE_HEADERS = debian/qtdeclarative5-private-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5
export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@@ -53,8 -50,19 +54,19 @@@ override_dh_auto_install-indep
override_dh_install:
dh_install --fail-missing
+ override_dh_link:
+ dh_link
+ @VERSION=$$(ls $(PRIVATE_HEADERS)/QtQml); \
+ set -e; for h in $$(ls $(PRIVATE_HEADERS)/QtQmlDevTools/$$VERSION/QtQmlDevTools/private/); do \
+ if [ -f $(PRIVATE_HEADERS)/QtQml/$$VERSION/QtQml/private/$$h ]; then \
+ echo "Symlinking QtQmlDevTools/private/$$h -> QtQml/private/$$h"; \
+ ln -sf ../../../../QtQml/$$VERSION/QtQml/private/$$h \
+ $(PRIVATE_HEADERS)/QtQmlDevTools/$$VERSION/QtQmlDevTools/private/$$h; \
+ fi; \
+ done
+
override_dh_makeshlibs:
- dh_makeshlibs -V
+ dh_makeshlibs
# Check for private symbols not marked as such. Be verbose.
pkgkde-mark-private-symbols debian/qtdeclarative5-private-dev/usr/include
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list