[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-beta+dfsg-4-24-g0cc49a4
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Thu Jan 21 00:28:18 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=0cc49a4
The following commit has been merged in the experimental branch:
commit 0cc49a43c22c803f5495eeed44332a0b09bff37b
Merge: 5ef8ba21d52712347709b7d433ec2315657cb1a7 e79fc72daa04bf835b673294700f290eb81e75b2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed Jan 20 21:28:04 2016 -0300
Merge branch 'master' into experimental
debian/changelog | 18 +
debian/control | 48 +--
debian/libqt5egldeviceintegration5.install | 3 -
.../libqt5egldeviceintegration5.lintian-overrides | 3 -
debian/libqt5egldeviceintegration5.symbols | 251 ------------
debian/libqt5gui5.install-common | 3 +
debian/libqt5gui5.install-linux | 3 +
debian/libqt5gui5.lintian-overrides | 18 +
debian/libqt5xcbqpa5.install | 3 -
debian/libqt5xcbqpa5.lintian-overrides | 3 -
debian/libqt5xcbqpa5.symbols | 421 ---------------------
debian/rules | 3 +-
12 files changed, 60 insertions(+), 717 deletions(-)
diff --cc debian/changelog
index 6c2c469,d6fd8f6..61b1045
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,105 -1,21 +1,123 @@@
+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-13) unstable; urgency=medium
+
+ * Fix URLs pointing to our "How to package Qt based stuff" page
+ (Closes: #810282). Thanks Jakob Haufe for the pointer.
+ * Merge platforms plugins back into libqt5gui5: libqt5egldeviceintegration5
+ and libqt5xcbqpa5(Closes: #796956, #802715, #809172, #809176).
+ - Avoid creating shlibs and symbols files for the private libraries they
+ ship.
+ - Add lintian overrides for the plugins's private libs. See the override's
+ description for more info.
+ - Add proper Breaks+Replaces.
+ - Remove other mentions of them.
+ - Add a transitional dummy package for libqt5xcbqpa5 as it's the only one
+ which has rdeps. We can safely remove it after the rdeps are fixed
+ (they are manually added).
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Wed, 20 Jan 2016 18:06:21 -0300
+
qtbase-opensource-src (5.5.1+dfsg-12) unstable; urgency=medium
* Backport xcb_dont_select_XInput_events_on_root_window.patch
diff --cc debian/libqt5gui5.lintian-overrides
index 1051b06,b278707..487c8e2
--- a/debian/libqt5gui5.lintian-overrides
+++ b/debian/libqt5gui5.lintian-overrides
@@@ -1,3 -1,21 +1,21 @@@
# This dependency has been added to track external packages building against
# our private headers. It is ok if internal packages depend on the ABI one.
-libqt5gui5: symbols-declares-dependency-on-other-package qtbase-abi-5-5-1
+libqt5gui5: symbols-declares-dependency-on-other-package qtbase-abi-*
+ # libQt5EglDeviceIntegration and libQt5XcbQpa are actually private libraries
+ # *only* used by their respective platforms plugins. Sadly instead of being
+ # installed into a proper place like /usr/lib/<arch-triplet>/qt5/ they are
+ # being installed into /usr/lib/.
+ # We are not shipping headers for them and the only binaries that depend on
+ # them are shipped within this very same binary package, so it's safe to
+ # override this Lintian warning.
+ libqt5gui5: shlib-missing-in-control-file libQt5EglDeviceIntegration 5 for usr/lib/*/libQt5EglDeviceIntegration.so.5.*
+ libqt5gui5: shlib-missing-in-control-file libQt5XcbQpa 5 for usr/lib/*/libQt5XcbQpa.so.5.*
+ # libQt5EglDeviceIntegration and libQt5XcbQpa are actually private libraries
+ # *only* used by their respective platforms plugins. Sadly instead of being
+ # installed into a proper place like /usr/lib/<arch-triplet>/qt5/ they are
+ # being installed into /usr/lib/.
+ # We are not shipping headers for them and the only binaries that depend on
+ # them are shipped within this very same binary package, so it's safe to
+ # override this Lintian warning.
+ libqt5gui5: shlib-missing-in-symbols-control-file libQt5EglDeviceIntegration 5 for usr/lib/*/libQt5EglDeviceIntegration.so.5.*
+ libqt5gui5: shlib-missing-in-symbols-control-file libQt5XcbQpa 5 for usr/lib/*/libQt5XcbQpa.so.5.*
diff --cc debian/rules
index 21569db,5d4ea15..470424e
--- a/debian/rules
+++ b/debian/rules
@@@ -326,8 -328,12 +326,9 @@@ override_dh_strip
dh_strip --remaining-packages --dbg-package=qtbase5-dbg
override_dh_makeshlibs:
- dh_makeshlibs -V
+ dh_makeshlibs -V -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
+ dh_makeshlibs -V --remaining-packages
- # 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