[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.7.1+dfsg-2-227-g3d8e512
Timo Jyrinki
timo at moszumanska.debian.org
Wed Jan 4 09:31:47 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=3d8e512
The following commit has been merged in the ubuntu+1 branch:
commit 3d8e512900d5d1752ad245d2dd417ca2257be491
Merge: 51c436c498bf68768b674034ab23ea5f0bbbf551 f9a88481bad1abd8671e4cde6153222e7b6683cc
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Wed Jan 4 09:16:59 2017 +0000
Merge branch 'ubuntu' into ubuntu+1
debian/changelog | 77 +++-
...DBus-crashes-during-application-destructi.patch | 121 ++++++
...arer-QFactoryLoader-a-member-variable-not.patch | 96 +++++
...DBusMetaType-s-custom-information-to-QDBu.patch | 429 +++++++++++++++++++++
...ing-plugins-in-QPluginLoader-and-QFactory.patch | 80 ++++
debian/patches/series | 4 +
6 files changed, 805 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index 61ceb2b,35b5ce5..f1255bc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,155 -1,74 +1,225 @@@
+qtbase-opensource-src (5.7.1+dfsg-2ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Drop patches included in upstream release:
+ - color-fonts.patch
+ - dbusmenu_exclusive_groups.diff
+ - dbusmenu_global_menu.diff
+ - dbustray_use_separate_connections.diff
+ - qplatformmenubar_createmenu.diff
+ - fix-scalable-bitmap-factor-caching.patch
+ - Make-sure-connection-is-not-null-before-using-it.patch
+ - xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
+ * Update symbols and mark private ones.
+ * Adjust tests enablement patch for Qt 5.7 and 5.7.1.
+ * Drop also net-bearer-nm-disconnect-ap-signals7.patch that was upstreamed.
+ * Ubuntu doesn't have package named libssl1.0-dev yet.
+ * debian/patches/QSettings-Avoid-unneeded-sync-on-destruction.patch:
+ - Backport from 5.8 (LP: #1642605)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 25 Aug 2016 11:01:48 +0000
+
+qtbase-opensource-src (5.7.1+dfsg-2) unstable; urgency=medium
+
+ * Backport upstream patch to fix build with gcc 6.3 and newer versions
+ (gcc_6.3.diff; closes: #846996).
+ * Update symbols files from buildds’ logs.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 25 Dec 2016 23:36:18 +0300
+
+qtbase-opensource-src (5.7.1+dfsg-1) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream final release.
+ * Refresh qsettings_XDG_CONFIG_DIRS.diff and qsettings_simplify_logic.diff.
+ * Build with system libdouble-conversion library (closes: #845372).
+ * Convert to automatic dbgsym packages.
+ * Bump documentation build-dependencies to 5.7.1.
+ * Replace 5.7.1~20161021 with 5.7.1 in the symbols files.
+ * Drop one optional symbol from debian/libqt5network5.symbols.
+ * Make qtbase5-dev suggest default-libmysqlclient-dev.
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Remove a bogus double hostdatadir entry while configuring Qt. Thanks
+ Nick Shaforostoff for the bug! (Closes: 847769).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 14 Dec 2016 17:23:44 +0300
+
+qtbase-opensource-src (5.7.1~20161021+dfsg-6) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Make libqt5network5 depend on libssl1.0.2. It will crash when
+ only newer libssl versions are installed.
+ * Backport upstream patch to fix build on x32 (fix_build_on_x32.diff).
+ * Merge some more entries in the update-copyright script.
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Update symbols files with buildds' logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Sun, 20 Nov 2016 11:28:29 -0300
+
+qtbase-opensource-src (5.7.1~20161021+dfsg-5) unstable; urgency=medium
+
+ * Switch libssl-dev to libssl1.0-dev. We can't yet use libssl 1.1.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Wed, 02 Nov 2016 19:09:23 -0300
+
+qtbase-opensource-src (5.7.1~20161021+dfsg-4) unstable; urgency=medium
+
+ * Drop Build-Conflicts: libmariadbclient-dev, should be no longer needed.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 01 Nov 2016 16:20:07 +0300
+
+qtbase-opensource-src (5.7.1~20161021+dfsg-3) unstable; urgency=medium
+
+ * Change build-dependency libmysqlclient-dev → default-libmysqlclient-dev.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 01 Nov 2016 13:47:12 +0300
+
+qtbase-opensource-src (5.7.1~20161021+dfsg-2) experimental; urgency=medium
+
+ * Backport two patches to add proper support for XDG_CONFIG_DIRS to
+ QSettings; needed for LXQt transition (qsettings_simplify_logic.diff,
+ qsettings_XDG_CONFIG_DIRS.diff).
+ * Configure with -no-use-gold-linker on i386 to work around build failures
+ of qtscript and qtgraphicaleffects (see binutils bug #842304).
+ * Update symbols files from buildds’ logs.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 28 Oct 2016 17:04:09 +0300
+
+qtbase-opensource-src (5.7.1~20161021+dfsg-1) experimental; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream snapshot.
+ * Drop debian/patches/qdevicediscovery_dummy.diff, applied upstream.
+ * Update the copyright script to use a stricter formula for GPL-2 license.
+ * Update debian/copyright.
+ * Install the qtpng static library in qtbase5-dev (following upstream).
+ * Update the symbols files from amd64 build log.
+ * Bump qtbase-abi version to 5-7-1.
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Require pkg-kde-tools (>= 0.15.17~) to allow using backported versions.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 21 Oct 2016 21:08:52 +0300
+
+qtbase-opensource-src (5.7.0+dfsg-3) experimental; urgency=medium
+
+ * Replace qdevicediscovery_dummy.diff with a proper patch from upstream.
+ * Update debian/libqt5dbus5.symbols once again.
+ * Mark private symbols using pkgkde-mark-qt5-private-symbols.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 05 Jul 2016 21:10:28 +0300
+
+qtbase-opensource-src (5.7.0+dfsg-2) experimental; urgency=medium
+
+ * Add a patch (qdevicediscovery_dummy.diff) to fix a linking error on
+ GNU/kFreeBSD.
+ * Add support for ARMv4 architecture, needed to get armel builds working.
+ * Update debian/libqt5dbus5.symbols from buildds’ logs.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 01 Jul 2016 19:59:52 +0300
+
+qtbase-opensource-src (5.7.0+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Drop debian/scripts/migrate-symbols.py, no longer needed.
+ * Drop lib/fonts/* from excluded files, these are no longer shipped
+ (since upstream commit c5ceabb9a1caf6b9).
+ * Refresh patches for the new release.
+ * Update for upstream GTK+ 3 port:
+ - Build-depend on libgtk-3-dev.
+ - Rename libqt5libqgtk2 to qt5-gtk-platformtheme.
+ - Make it a recommendation of libqt5gui5 rather than a suggestion.
+ * Update debian/qtbase5-dev.install-common for the new release.
+ * Install libQt5EglFsKmsSupport library in libqt5gui5, the same way as
+ libQt5EglDeviceIntegration.
+ * Update symbols files from amd64 and i386 build logs.
+ * Merge two dh_makeshlibs calls, so that only one build is needed to get
+ the symbols diffs.
+ * Update debian/copyright:
+ - Libraries code is now licensed under LGPL-3 or GPL-2+.
+ - Tools and tests are now licensed under GPL-3 with exceptions.
+ - Examples and documentation are still licensed under 3-clause BSD.
+ * Add a script to automatically generate some copyright information.
+ * Update clean rules to prevent deleting test data.
+ * Drop obsolete Breaks/Replaces.
+ * Bump qtbase-abi version to 5-7-0.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 29 Jun 2016 09:26:08 +0300
+
- qtbase-opensource-src (5.6.1+dfsg-3ubuntu3) UNRELEASED; urgency=medium
+ qtbase-opensource-src (5.6.2+dfsg-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release 5.6.2.
+ * Drop patches in upstream 5.6.2 release:
+ - xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
+ - dbustray_use_separate_connections.diff
+ - Make-sure-connection-is-not-null-before-using-it.patch
+ - Fix-gcc-Wsuggest-override-warning-on-Q_OBJECT.patch
+ - Fix-parsing-of-tzfile-5-POSIX-rule-zone-names-with-b.patch
+ - Avoid-artifacts-when-hiding-or-closing-a-QOpenGLWidg.patch
+ - net-bearer-nm-disconnect-ap-signals7.patch
+ (this upstreamed as https://codereview.qt-project.org/#/c/166147/)
+ * Update patches to non-rebased forms to apply cleanly:
+ - Fix-the-GCC-version-supporting-Wsuggest-override.patch
+ - QtWidgets-Send-show-hide-event-to-children-on-restor.patch
+ * Skip a few widgets related tests having failures.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 13 Oct 2016 13:22:14 +0000
+
+ qtbase-opensource-src (5.6.1+dfsg-3ubuntu7~2) yakkety; urgency=medium
+
+ * debian/patches/Stop-unloading-plugins-in-QPluginLoader-and-QFactory.patch:
+ - Backport from Qt 5.8.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 06 Oct 2016 07:18:59 +0000
+
+ qtbase-opensource-src (5.6.1+dfsg-3ubuntu6~4) yakkety; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Mark allow_native_menubar.diff as applied upstream.
+ * debian/patches/dbustray_cleanup_notifier.diff:
+ - Fix a bug in QSystemTrayIcon code where the notifier was not cleaned
+ up and the callback was called multiple times.
+
+ [ Timo Jyrinki ]
+ * debian/patches/Fix-some-QtDBus-crashes-during-application-destructi.patch
+ debian/patches/Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
+ debian/patches/Make-the-bearer-QFactoryLoader-a-member-variable-not.patch:
+ - More D-Bus fixes (LP: #1618590)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Wed, 28 Sep 2016 18:14:12 +0000
+
+ qtbase-opensource-src (5.6.1+dfsg-3ubuntu5~1) yakkety; urgency=medium
+
+ * debian/patches/dbusmenu-Don-t-leave-dangling-pointers-when-menus-ar.patch:
+ - Fix a crasher in qdbusmenu code (LP: #1620937)
+ * debian/patches/QMenuBar-Get-rid-of-QMenuBarPrivate-nativeMenuBar.patch:
+ - Improve menu bar code, but for now allow_native_menubar.diff is still
+ needed.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Fri, 16 Sep 2016 05:08:05 +0000
+
+ qtbase-opensource-src (5.6.1+dfsg-3ubuntu4~6) yakkety; urgency=medium
+
+ [ Timo Jyrinki ]
+ * debian/patches/Make-QDBusConnectionPrivate-relaySignal-be-called-in.patch:
+ - Antoher DBus fix needed for telephony-service (LP: #1620945)
+ * debian/patches/Fix-gcc-Wsuggest-override-warning-on-Q_OBJECT.patch
+ debian/patches/Fix-the-GCC-version-supporting-Wsuggest-override.patch:
+ - Fix GCC -Wsuggest-override warning on Q_OBJECT (LP: #1619483)
+ * debian/patches/Fix-parsing-of-tzfile-5-POSIX-rule-zone-names-with-b.patch:
+ - Fix parsing of rule zone names for certain time zones (LP: #1622089)
+ * debian/patches/Avoid-artifacts-when-hiding-or-closing-a-QOpenGLWidg.patch
+ debian/patches/QtWidgets-Send-show-hide-event-to-children-on-restor.patch:
+ - Fix event sending to children, hurting Oxide-Qt use on desktop
+ (LP: #1613670)
+ * Disable QStaticText tests for now (QTBUG-55653)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Mon, 12 Sep 2016 05:42:31 +0000
+
+ qtbase-opensource-src (5.6.1+dfsg-3ubuntu3~3) yakkety; urgency=medium
[ Timo Jyrinki ]
* debian/patches/QDBusServer-delay-processing-of-D-Bus-messages.patch:
diff --cc debian/patches/series
index 1a22446,be00756..945c844
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,12 -1,24 +1,16 @@@
# Backported from upstream
-no_dbus_dependency.diff
-color-fonts.patch
-fix-scalable-bitmap-factor-caching.patch
-QDBusServer-delay-processing-of-D-Bus-messages.patch
-dbusmenu_exclusive_groups.diff
-qplatformmenubar_createmenu.diff
-dbusmenu_global_menu.diff
-Make-QDBusConnectionPrivate-relaySignal-be-called-in.patch
-Fix-the-GCC-version-supporting-Wsuggest-override.patch
-QtWidgets-Send-show-hide-event-to-children-on-restor.patch
-dbusmenu-Don-t-leave-dangling-pointers-when-menus-ar.patch
-QMenuBar-Get-rid-of-QMenuBarPrivate-nativeMenuBar.patch
-allow_native_menubar.diff
-dbustray_cleanup_notifier.diff
+qsettings_simplify_logic.diff
+qsettings_XDG_CONFIG_DIRS.diff
+fix_build_on_x32.diff
+gcc_6.3.diff
+QSettings-Avoid-unneeded-sync-on-destruction.patch
+ Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
+ Fix-some-QtDBus-crashes-during-application-destructi.patch
+ Make-the-bearer-QFactoryLoader-a-member-variable-not.patch
+ Stop-unloading-plugins-in-QPluginLoader-and-QFactory.patch
# Debian specific.
+no_dbus_dependency.diff
gnukfreebsd.diff
no_htmlinfo_example.diff
remove_privacy_breachs.diff
--
qtbase packaging
More information about the pkg-kde-commits
mailing list