[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-10-ge76670e
Timo Jyrinki
timo at moszumanska.debian.org
Thu Aug 25 06:50:29 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=6e9486c
The following commit has been merged in the ubuntu branch:
commit 6e9486c7156c68d82f1ca83ea67092223a70ee49
Merge: 90ed51590ab15ad460a1bf4ae1872626d3ac7a59 5ef8ba21d52712347709b7d433ec2315657cb1a7
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Mon Jan 18 09:55:49 2016 +0000
Merge branch 'experimental' into ubuntu+1
debian/README.source | 28 ++-
debian/changelog | 102 ++++++++++
debian/control | 21 +-
debian/copyright | 21 +-
debian/libqt5concurrent5.lintian-overrides | 2 +-
debian/libqt5core5a.install-hurd-i386 | 1 -
debian/libqt5core5a.install-kfreebsd-i386 | 1 -
debian/libqt5core5a.lintian-overrides | 2 +-
debian/libqt5dbus5.lintian-overrides | 2 +-
.../libqt5egldeviceintegration5.lintian-overrides | 2 +-
debian/libqt5gui5.install-hurd-i386 | 1 -
debian/libqt5gui5.install-kfreebsd-i386 | 1 -
debian/libqt5gui5.lintian-overrides | 2 +-
debian/libqt5network5.lintian-overrides | 2 +-
debian/libqt5opengl5.lintian-overrides | 2 +-
debian/libqt5printsupport5.lintian-overrides | 2 +-
debian/libqt5sql5.lintian-overrides | 2 +-
debian/libqt5test5.lintian-overrides | 2 +-
debian/libqt5widgets5.lintian-overrides | 2 +-
debian/libqt5xcbqpa5.lintian-overrides | 2 +-
debian/libqt5xml5.lintian-overrides | 2 +-
...-option-to-skip-the-generic-bearer-engine.patch | 55 ------
...ment-variable-support-for-testability-lib.patch | 35 ----
...owerVR-Rogue-G6200-v1.3-from-supporting-B.patch | 55 ------
...x-crash-on-exit-caused-by-QStringLiterals.patch | 42 ----
...-falsely-reported-style-for-fallback-font.patch | 55 ------
...e-UnknownAccessibility-not-block-requests.patch | 52 -----
...fer-QT_PLUGIN_PATH-over-compiled-in-paths.patch | 70 -------
...orical-4-padding-in-QFontEngine-alphaMapF.patch | 45 -----
...me-if-Node-logicalModuleName-is-empty-for.patch | 28 ---
debian/patches/bsd_volumeinfo.diff | 36 ----
debian/patches/detect_64bit_atomic.diff | 207 --------------------
debian/patches/gnukfreebsd.diff | 2 +-
debian/patches/hurd_forkfd.diff | 16 --
debian/patches/mips_no_atomic.diff | 22 ---
debian/patches/multiscreen.diff | 16 +-
debian/patches/no_dbus_dependency.diff | 19 ++
debian/patches/qnativesocketengine_freebsd.diff | 16 ++
.../qnetworkaccessmanager_accessibility.diff | 214 ---------------------
debian/patches/qnetworkreply_abort_socket.diff | 113 -----------
debian/patches/qt_functions_missing_eval.diff | 16 ++
debian/patches/series | 28 +--
.../set_WA_OutsideWSRange_for_native_widgets.patch | 28 ---
debian/patches/set_positionautomatic.diff | 30 ---
debian/patches/uic_qvalidator_qtgui.diff | 22 ---
...-another-crash-when-screens-are-disconnec.patch | 37 ----
..._dont_select_XInput_events_on_root_window.patch | 2 +-
...b_fix_drag_and_drop_when_window_is_hidden.patch | 24 +--
debian/qtbase5-dev-tools.install | 2 +-
debian/qtbase5-dev.install-common | 25 ++-
debian/qtbase5-dev.install-linux | 1 -
debian/qtbase5-doc-html.install | 1 -
debian/qtbase5-doc.install | 13 ++
debian/qtbase5-private-dev.install | 1 -
debian/rules | 31 ++-
debian/scripts/migrate-symbols.py | 103 ++++++++++
debian/source/lintian-overrides | 3 -
debian/watch | 4 +-
58 files changed, 402 insertions(+), 1269 deletions(-)
diff --cc debian/changelog
index 29a2dd9,6c2c469..683b6fb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,105 +1,112 @@@
+ qtbase-opensource-src (5.6.0~beta+dfsg-5) UNRELEASED; urgency=medium
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Fix URLs pointing to our "How to package Qt based stuff" page
+ (Closes: #810282). Thanks Jakob Haufe for the pointer.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 08 Jan 2016 12:17:40 -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-12ubuntu1) UNRELEASED; urgency=medium
+
+ * Backport XCB patch related to screen disconnection handling QTBUG-42985:
+ - xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Mon, 18 Jan 2016 08:36:13 +0000
+
qtbase-opensource-src (5.5.1+dfsg-12) unstable; urgency=medium
* Backport xcb_dont_select_XInput_events_on_root_window.patch
diff --cc debian/control
index 36bcfac,1d5c65d..ddc34e0
--- a/debian/control
+++ b/debian/control
@@@ -62,8 -62,9 +62,10 @@@ Build-Depends: debhelper (>= 9)
pkg-kde-tools (>= 0.15.17),
publicsuffix,
unixodbc-dev,
+ xvfb,
zlib1g-dev
+ Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0~),
+ qttools5-dev-tools (>= 5.6.0~)
Build-Conflicts: libmariadbclient-dev
Standards-Version: 3.9.6
Homepage: http://qt-project.org/
diff --cc debian/patches/series
index a134126,f055d2a..835319f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -28,10 -11,3 +11,9 @@@ gnukfreebsd.dif
no_htmlinfo_example.diff
remove_privacy_breachs.diff
link_fbclient.diff
+
+# Ubuntu specific.
+qt5-qmake-arm-linux-gnueabihf
+Add-workaround-for-GL-on-Android-emulator.patch
- enable-tests.patch
- Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch
++#enable-tests.patch
+skip-largefile-test-s390x.patch
diff --cc debian/rules
index 50765b4,21569db..e1beecd
--- a/debian/rules
+++ b/debian/rules
@@@ -387,13 -326,8 +385,10 @@@ override_dh_strip
dh_strip --remaining-packages --dbg-package=qtbase5-dbg
override_dh_makeshlibs:
- dh_makeshlibs -V
+ # Don't uncomment until rid of -gles packages
+ #dh_makeshlibs -V
+ dh_makeshlibs
- # Check for private symbols not marked as such. Be verbose.
- pkgkde-mark-private-symbols debian/qtbase5-private-dev/usr/include
-
override_dh_clean:
dh_clean
--
qtbase packaging
More information about the pkg-kde-commits
mailing list