[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.6.0+dfsg-2-142-gecb15a2
Timo Jyrinki
timo at moszumanska.debian.org
Wed Apr 13 07:44:21 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=ecb15a2
The following commit has been merged in the ubuntu+1 branch:
commit ecb15a2e2d5a091d795b4008028abddb8a8468d3
Merge: 7ed269ecd2e3398541f94877f7020232e1696f98 b45c6918eb71fda19984a067d03eefbbdd5a51b4
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Wed Apr 13 07:44:15 2016 +0000
Merge branch 'ubuntu' into ubuntu+1
debian/changelog | 71 ++++++++++++++++++++++
debian/patches/detect-indicator-application.diff | 63 +++++++++++++++++++
debian/patches/enable-tests.patch | 11 ++++
debian/patches/fix-duplicate-qnam-finished.patch | 53 ++++++++++++++++
debian/patches/series | 3 +
...xcb_fix_parent_screen_of_embedded_windows.patch | 14 +++++
6 files changed, 215 insertions(+)
diff --cc debian/changelog
index 3b07cd6,a0b89dc..9bb91f6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,173 -1,45 +1,215 @@@
+qtbase-opensource-src (5.6.0+dfsg-2ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Migrate symbols using the script to the Qt_5 versioning scheme.
+ * Update symbols and bump symbols abi.
+ * Rebase and refresh enable-tests.patch.
+ * Rebase qnam-ubuntu-fix6.patch.
+ * Mark private symbols.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Mon, 18 Jan 2016 10:06:17 +0000
+
+qtbase-opensource-src (5.6.0+dfsg-3) UNRELEASED; urgency=medium
+
+ * Improve the Xsession.d script so it won't fail if mesa-utils is
+ not installed. Also log why glxinfo is needed for this script.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 17 Mar 2016 09:59:33 -0300
+
+qtbase-opensource-src (5.6.0+dfsg-2) experimental; urgency=medium
+
+ * Do not call exit on the Xsession.d script, as it's being sourced.
+ * Add mesa-utils as a libqt5gui5 dependency, needed for the script.
+ * Update symbols files with buildds' logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Thu, 17 Mar 2016 09:50:28 -0300
+
+qtbase-opensource-src (5.6.0+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ - Update debian/watch to point at official releases again.
+ - Fix division by zero in xcb plugin (Closes: #814729).
+ * Update symbols files with buidds' logs.
+ * Install the 90qt5-opengl script into Xsession.d in order to force
+ software rendering in case the user does not has at least OpenGL 2
+ support (Closes: #811195).
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Wed, 16 Mar 2016 13:02:52 -0300
+
+qtbase-opensource-src (5.6.0~rc+dfsg-1) experimental; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream release candidate.
+ * Merge 5.5.1+dfsg-15 from master.
+ * Drop the following patches, all applied upstream:
+ - Fix-falsely-reported-style-for-fallback-font.patch
+ - Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch
+ - Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
+ - multiscreen.diff
+ - qnativesocketengine_freebsd.diff
+ - qt_functions_missing_eval.diff
+ - xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
+ - xcb_dont_select_XInput_events_on_root_window.patch
+ - xcb_fix_drag_and_drop_when_window_is_hidden.patch
+ * Add new build-dependency on libxcb-xinerama0-dev.
+ * Update symbols files from the build log.
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection. The
+ patch is a simple workaround, a proper bug has been opened upstream as
+ stated in the patch's headers.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 05 Mar 2016 10:35:53 +0300
+
+qtbase-opensource-src (5.6.0~beta+dfsg-5) experimental; urgency=medium
+
+ * Fix URLs pointing to our "How to package Qt based stuff" page
+ (Closes: #810282). Thanks Jakob Haufe for the pointer.
+ * Merge 5.5.1+dfsg-13's changes into the experimental branch.
+ - Bump libqt5gui5's Breaks+Replaces so that users who installed
+ the experimental version have a proper package update.
+ * Remove the transitional package libqt5xcbqpa5, their only rdeps
+ lived in sid/testing and already removed it.
+ * Merge 5.5.1+dfsg-14 from master, importing fix_not_delivering_focus.patch.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Mon, 15 Feb 2016 15:49:42 -0300
+
+qtbase-opensource-src (5.6.0~beta+dfsg-4) experimental; urgency=medium
+
+ * Drop unused dbus build-dependency.
+ * Stop running pkgkde-mark-qt5-private-symbols script during build. The new
+ way is that the maintainers run it themselves after each symbols update.
+ * Make sure dh_installchangelogs is called even when upstream changelog is
+ not present.
+ * Use wildcards instead of hardcoded ABI versions in Lintian overrides files.
+ * Merge 5.5.1+dfsg-11 and 5.5.1+dfsg-12 unstable uploads.
+ - Refresh patches.
+ * When merging install files, take DEB_HOST_ARCH_CPU into account, instead of
+ DEB_HOST_ARCH. This is much more useful for us, because it allows us not to
+ ship identical files for i386, hurd-i386 and kfreebsd-i386.
+ * Exclude qdoc documentation from debian/qtbase5-doc-html.install (moved to
+ qttools module).
+ * Remove qdoc mention from qtbase5-dev-tools package description.
+ * Re-enable building the documentation.
+ - Add libqt5sql5-sqlite and qttools5-dev-tools to Build-Depends-Indep.
+ * README.source:
+ - Update the section on marking the private symbols.
+ - Add a new section about bootstrapping the docs packages.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 08 Jan 2016 10:21:22 +0300
+
+qtbase-opensource-src (5.6.0~beta+dfsg-3) experimental; urgency=medium
+
+ * Add qt_functions_missing_eval.diff to make qmake generate proper code for
+ custom plugin paths. This change is needed to make qtimageformats tests
+ success.
+ * Small updates to debian/copyright.
+ * Drop debian/source/lintian-overrides, the only override there is no longer
+ needed.
+ * Update the symbols files for kfreebsd-i386.
+ * Remove sparc references from the symbols files, sparc is dead.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 03 Jan 2016 21:03:01 +0300
+
+qtbase-opensource-src (5.6.0~beta+dfsg-2) experimental; urgency=medium
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Add meta-information to symbols files in order to make sure that the
+ dependency generated is at least as strict as the version of qtbase5-dev
+ used during the compilation. This should avoid parts of the Qt stack
+ (or any other app) migrating to testing before qtbase itself due to it
+ using only symbols present in older versions.
+
+ [ Dmitry Shachnev ]
+ * Bump qtbase-abi version to 5-6-0.
+ * Add qnativesocketengine_freebsd.diff to fix the build failure on kFreeBSD.
+ * Update symbols files from buildds’ logs.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 30 Dec 2015 09:48:18 +0300
+
+qtbase-opensource-src (5.6.0~beta+dfsg-1) experimental; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream beta release.
+ * Update debian/watch to track experimental releases (needs to be reverted
+ before uploading 5.6.0 final).
+ * Drop the following patches, all are applied upstream:
+ - set_positionautomatic.diff
+ - set_WA_OutsideWSRange_for_native_widgets.patch
+ - bsd_volumeinfo.diff
+ - hurd_forkfd.diff
+ - mips_no_atomic.diff
+ - detect_64bit_atomic.diff
+ - qnetworkreply_abort_socket.diff
+ - qnetworkaccessmanager_accessibility.diff
+ - uic_qvalidator_qtgui.diff
+ - Fix-crash-on-exit-caused-by-QStringLiterals.patch
+ * Refresh debian/patches/gnukfreebsd.diff.
+ * Add a new script (debian/scripts/migrate-symbols.py) to help with migrating
+ the symbols files to a new upstream symbols versioning scheme (Qt_5 or
+ Qt_5_PRIVATE_API as the version part).
+ * Update the symbols files using the script, and with build logs for amd64
+ and i386.
+ * Use the new pkgkde-mark-qt5-private-symbols script (which takes upstream
+ version tags into account) from pkg-kde-tools ≥ 0.15.20.
+ * Add a patch to remove useless check for D-Bus presense on configure time.
+
+ [ Diane Trout ]
+ * Disable building docs. Upstream moved qdoc to qttools source, so we
+ will re-enable building them when we get qttools 5.6 built.
+ * Add guard for no new upstream changelog.
+ * Add new headers.
+ * Remove MetaType headers.
+ * Remove missing pkg-config files.
+ * Add new documentation resources.
+ * Remove qatomic_mips.h header, dropped upstream.
+ * Remove qdoc from qtbase5-dev-tools.install as it appears to be missing.
+ * Add fixqt4headers.pl to qtbase5-dev-tools.install.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 29 Dec 2015 22:29:25 +0300
+
+ qtbase-opensource-src (5.5.1+dfsg-16ubuntu7) xenial; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Backport upstream change from 5.6 branch to implement better detection
+ of indicator-application based trays. Refs LP: #1546328.
+ * Update symbols files for symbols added in the latest patches.
+
+ [ Timo Jyrinki ]
+ * debian/patches/fix-duplicate-qnam-finished.patch:
+ - Fix multiple calls to signals of QNAM object (LP: #1564142)
+
+ -- Dmitry Shachnev <mitya57 at ubuntu.com> Tue, 12 Apr 2016 19:17:34 +0300
+
+ qtbase-opensource-src (5.5.1+dfsg-16ubuntu6) xenial; urgency=medium
+
+ [ Alberto Mardegan ]
+ * debian/patches/xcb_fix_parent_screen_of_embedded_windows.patch:
+ - Fix wrong size of embedded window. Fixed in upstream Qt 5.6.
+ (LP: #1564767)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Tue, 05 Apr 2016 13:59:17 +0000
+
+ qtbase-opensource-src (5.5.1+dfsg-16ubuntu5) xenial; urgency=medium
+
+ * Rebuild against libmysqlclient20.
+
+ -- Robie Basak <robie.basak at ubuntu.com> Tue, 05 Apr 2016 12:57:34 +0000
+
+ qtbase-opensource-src (5.5.1+dfsg-16ubuntu4) xenial; urgency=medium
+
+ * debian/patches/qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch:
+ - Fix typos in property definitions. (LP: #1557259)
+ * Temporarily disable a test broken by glibc upgrade (LP: #1560528).
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Tue, 29 Mar 2016 11:30:45 +0000
+
+ qtbase-opensource-src (5.5.1+dfsg-16ubuntu1) xenial; urgency=medium
+
+ * Merge with Debian 5.5.1+dfsg-16.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Mon, 07 Mar 2016 09:17:45 +0000
+
qtbase-opensource-src (5.5.1+dfsg-16) unstable; urgency=medium
* Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection.
diff --cc debian/patches/enable-tests.patch
index 7212c7a,f17bd03..6766c9e
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@@ -23597,18 -23582,14 +23597,29 @@@ Index: qtbase-opensource-src-5.6.0-rc/t
}
{
// Shift-JIS device
+diff -urN qtbase-opensource-src-5.6.0.old/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp qtbase-opensource-src-5.6.0/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
+--- qtbase-opensource-src-5.6.0.old/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp 2016-03-03 11:35:22.000000000 +0000
++++ qtbase-opensource-src-5.6.0/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp 2016-03-18 13:25:42.621419518 +0000
+@@ -100,9 +100,11 @@
+ # endif
+ #endif
+ #ifdef Q_ATOMIC_INT64_IS_SUPPORTED
++#if !defined(__i386__)
+ # define TYPE_SUPPORTED_qlonglong 1
+ # define TYPE_SUPPORTED_qulonglong 1
+ #endif
++#endif
+
+ #ifdef Q_MOC_RUN
+ # define QATOMIC_TYPE_SUPPORTED(type) 1
+ diff -urN qtbase-opensource-src-5.5.1.old/tests/auto/corelib/io/largefile/tst_largefile.cpp qtbase-opensource-src-5.5.1/tests/auto/corelib/io/largefile/tst_largefile.cpp
+ --- qtbase-opensource-src-5.5.1.old/tests/auto/corelib/io/largefile/tst_largefile.cpp 2016-03-29 11:27:07.416069388 +0000
+ +++ qtbase-opensource-src-5.5.1/tests/auto/corelib/io/largefile/tst_largefile.cpp 2016-03-29 11:26:44.536068919 +0000
+ @@ -505,6 +505,7 @@
+ //Mac: memory-mapping beyond EOF may succeed but it could generate bus error on access
+ void tst_LargeFile::mapOffsetOverflow()
+ {
+ + QSKIP("Skipped for now also on 32-bit, see LP: #1560528");
+ #ifndef Q_OS_MAC
+ // Out-of-range mappings should fail, and not silently clip the offset
+ for (int i = 50; i < 63; ++i) {
diff --cc debian/patches/series
index 07d5b80,17eeaa8..fa577dc
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,36 +1,9 @@@
-# Backported stuff
-Add-environment-variable-support-for-testability-lib.patch
-Add-an-option-to-skip-the-generic-bearer-engine.patch
-Blacklist-PowerVR-Rogue-G6200-v1.3-from-supporting-B.patch
-set_positionautomatic.diff
-set_WA_OutsideWSRange_for_native_widgets.patch
-bsd_volumeinfo.diff
-hurd_forkfd.diff
-Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch
-Fix-falsely-reported-style-for-fallback-font.patch
-Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
-xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
-Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch
-mips_no_atomic.diff
-detect_64bit_atomic.diff
-qnetworkreply_abort_socket.diff
-qnetworkaccessmanager_accessibility.diff
-uic_qvalidator_qtgui.diff
-Fix-crash-on-exit-caused-by-QStringLiterals.patch
-Make-UnknownAccessibility-not-block-requests.patch
-multiscreen.diff
-xcb_dont_select_XInput_events_on_root_window.patch
-xcb_fix_drag_and_drop_when_window_is_hidden.patch
-fix_not_delivering_focus.patch
-fix_potential_division_by_zero.patch
-Notify-when-the-primary-screen-changes.patch
-Xcb-fix-crash-on-screen-power-save.patch
-xcb-Handle-screen-siblings-in-QXcbVirtualDesktop.patch
-xcb-Use-a-placeholder-QScreen-when-there-are-no-outp.patch
+# Backported from upstream
dbusmenu_fixes.diff
dbustray_fixes.diff
-qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch
+no_dbus_dependency.diff
+fix_not_delivering_focus.patch
+ detect-indicator-application.diff
# Debian specific.
gnukfreebsd.diff
--
qtbase packaging
More information about the pkg-kde-commits
mailing list