[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.2+dfsg-4-278-g9c92c4a
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat Oct 28 20:25:29 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=9c92c4a
The following commit has been merged in the ubuntu+1 branch:
commit 9c92c4a493f53302bdda3eaa7aa1196d07b2598e
Merge: 023455c51b384abcab55c7c414279e049d243b50 f5360674b18b63b2918a36f8644ac7785b69c797
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Sat Oct 28 13:34:56 2017 -0500
Merge tag 'debian/5.9.2+dfsg-4' into ubuntu+1
5.9.2+dfsg-4 unstable; urgency=medium
debian/changelog | 70 ++++++++++++++++
debian/compat | 2 +-
debian/control | 26 ++++--
debian/copyright | 98 ++++++++++++++--------
debian/libqt5concurrent5.symbols | 2 +-
debian/libqt5core5a.symbols | 11 ++-
debian/libqt5dbus5.symbols | 2 +-
debian/libqt5gui5.symbols | 2 +-
debian/libqt5network5.symbols | 2 +-
debian/libqt5opengl5.symbols | 2 +-
debian/libqt5printsupport5.symbols | 6 +-
debian/libqt5sql5.symbols | 2 +-
debian/libqt5test5.symbols | 2 +-
debian/libqt5widgets5.symbols | 2 +-
debian/libqt5xml5.symbols | 2 +-
debian/patches/fix_atspi_condition.diff | 15 ----
debian/patches/gnukfreebsd_cloexec.diff | 22 ++---
debian/patches/link_fbclient.diff | 4 +-
debian/patches/qglxconvenience_nullptr.diff | 25 ++++++
debian/patches/series | 2 +-
debian/qt5-qmake-bin.install | 1 +
debian/qt5-qmake-bin.links | 2 +
.../{qt5-qmake.manpages => qt5-qmake-bin.manpages} | 0
debian/qt5-qmake.install | 1 -
debian/qtbase5-dev-tools.install | 16 ++--
debian/qtbase5-dev-tools.links | 9 ++
debian/rules | 14 +---
27 files changed, 239 insertions(+), 103 deletions(-)
diff --cc debian/changelog
index 7f5ee25,cae9ef5..fdec9ba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,63 +1,84 @@@
++qtbase-opensource-src (5.9.2+dfsg-4ubuntu1) UNRELEASED; urgency=medium
++
++ * Merge from Debian Sid. Remaining changes:
++ - Depend on libssl1.0.0 instead of libssl1.0.2.
++ - Enable tests for amd64, armhf, and i386.
++ - Add arm64 to the architectures that GLES is enabled on.
++ - Make qt5-default Multi-Arch: same.
++
++ -- Simon Quigley <tsimonq2 at ubuntu.com> Sat, 28 Oct 2017 12:06:41 -0500
++
+ qtbase-opensource-src (5.9.2+dfsg-4) unstable; urgency=medium
+
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 26 Oct 2017 14:16:31 +0300
+
+ qtbase-opensource-src (5.9.2+dfsg-3) experimental; urgency=medium
+
+ * Merge 5.9.1+dfsg-12 upload from unstable.
+ * Move ${shlibs:Depends} from qt5-qmake to qt5-qmake-bin.
+ * Move all Qt binaries to a non-multiarch location, /usr/lib/qt5/bin/, for
+ improved cross-build support. Provide compatibility symlinks for the old
+ location.
+ * Bump qttools5-dev-tools build-dependency to 5.9.2-2, as the build system
+ now looks for qdoc and qtattributionsscanner in the new location.
+ * Use debhelper compat level 10 and dh_missing.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 19 Oct 2017 22:47:48 +0300
+
+ qtbase-opensource-src (5.9.2+dfsg-2) experimental; urgency=medium
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Bump qtbase-abi to 5-9-2. We can't warrant that we catch all ABI changes
+ (specially with private stuff) and there is still the internal version
+ check, so we need to bump it even if we do not find API/ABI changes.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 14 Oct 2017 10:23:26 +0300
+
+ qtbase-opensource-src (5.9.2+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Drop fix_atspi_condition.diff, it was coming from upstream.
+ * Port gnukfreebsd_cloexec.diff to new upstream code.
+ * Stop excluding src/3rdparty/zlib/doc/rfc*.txt from the tarball,
+ these files are no longer shipped by upstream.
+ * Update symbols files from the current build log.
+ * Update debian/copyright.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 06 Oct 2017 23:10:25 +0700
+
+ qtbase-opensource-src (5.9.1+dfsg-12) unstable; urgency=medium
+
+ * Use the linux-g++ mkspec on all Linux architectures. We do not need
+ the -m64 compiler flag which linux-g++-64 adds.
+ * Split qmake binary into a new binary package, qt5-qmake-bin.
+ Make the new package Multi-Arch: foreign, to make sure that a proper
+ version of qmake gets installed for cross builds (closes: #876861).
+ * Bump Standards-Version to 4.1.1, no changes needed.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 04 Oct 2017 11:41:29 +0700
+
+ qtbase-opensource-src (5.9.1+dfsg-11) unstable; urgency=medium
+
+ * Backport upstream patch to fix crash in qglx_findConfig() function
+ (qglxconvenience_nullptr.diff, closes: #841951).
+ * Backport upstream patch to call mysql_library_end() only once when
+ using MariaDB (mariadb_library_end.diff).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 28 Sep 2017 00:03:45 +0300
+
+qtbase-opensource-src (5.9.1+dfsg-10ubuntu1) artful; urgency=medium
+
+ * Merge with Debian unstable, remaining changes:
+ - Depend on libssl1.0.0 instead of libssl1.0.2.
+ - Enable tests for amd64, armhf, and i386.
+ - Add arm64 to the architectures that GLES is enabled on.
+ - Make qt5-default Multi-Arch: same.
+ * Build with firebird support to reduce delta with Debian.
+
+ -- Dmitry Shachnev <mitya57 at ubuntu.com> Sat, 23 Sep 2017 20:13:55 +0300
+
qtbase-opensource-src (5.9.1+dfsg-10) unstable; urgency=medium
[ Dmitry Shachnev ]
diff --cc debian/control
index ad7ed46,62197d1..20e797b
--- a/debian/control
+++ b/debian/control
@@@ -64,11 -63,10 +64,11 @@@ Build-Depends: debhelper (>= 10.3)
pkg-kde-tools (>= 0.15.17~),
publicsuffix,
unixodbc-dev,
+ xvfb,
zlib1g-dev
Build-Depends-Indep: libqt5sql5-sqlite (>= 5.8.0+dfsg~) <!nodoc>,
- qttools5-dev-tools (>= 5.8.0~) <!nodoc>
- Standards-Version: 4.1.0
+ qttools5-dev-tools (>= 5.9.2-2~) <!nodoc>
+ Standards-Version: 4.1.1
Homepage: http://qt-project.org/
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtbase.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git
diff --cc debian/libqt5gui5.symbols
index 64f14c7,67d63d1..1cd7dd5
--- a/debian/libqt5gui5.symbols
+++ b/debian/libqt5gui5.symbols
@@@ -1,6 -1,6 +1,6 @@@
-# SymbolsHelper-Confirmed: 5.9.1 amd64 armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe
+# SymbolsHelper-Confirmed: 5.9.1 amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe
libQt5Gui.so.5 libqt5gui5 #MINVER#
- | libqt5gui5 #MINVER#, qtbase-abi-5-9-0
+ | libqt5gui5 #MINVER#, qtbase-abi-5-9-2
* Build-Depends-Package: qtbase5-dev
Qt_5.0 at Qt_5.0 5.6.0~beta
Qt_5.1 at Qt_5.1 5.6.0~beta
diff --cc debian/rules
index 6fabed6,1aa2757..1325763
--- a/debian/rules
+++ b/debian/rules
@@@ -43,17 -43,8 +43,11 @@@ ifeq ($(DEB_HOST_ARCH_CPU),i386
cpu_opt = -no-sse2 -no-pch
endif
+# Run tests only on archs known to pass in the past
+testrun_architectures := amd64 armhf i386
+
ifeq ($(DEB_HOST_ARCH_OS),linux)
- ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el arm64))
platform_arg = linux-g++
- else ifeq ($(DEB_HOST_ARCH_BITS),64)
- platform_arg = linux-g++-64
- else
- platform_arg = linux-g++
- endif
else ifeq ($(DEB_HOST_ARCH_OS),hurd)
platform_arg = hurd-g++
else ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
--
qtbase packaging
More information about the pkg-kde-commits
mailing list