[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.7.1+dfsg-2ubuntu1
Timo Jyrinki
timo at moszumanska.debian.org
Tue Jan 10 07:32:16 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=14b51d5
The following commit has been merged in the ubuntu branch:
commit 14b51d5067b154b6140416d6a1069b3ecaa1c568
Merge: bc3ac764e79244aa66c8873cea51d2853135b395 b6a5f91c0c9efa8d9c5fe584cf317186299900b4
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Sun Jan 1 07:17:32 2017 +0000
Merge branch 'master' into ubuntu+1
debian/changelog | 37 ++++++++++++++++++--
debian/control | 50 ++++-----------------------
debian/copyright | 22 ++++--------
debian/libqt5core5a.symbols | 17 ++++-----
debian/libqt5dbus5.symbols | 4 +--
debian/libqt5gui5.symbols | 8 ++---
debian/libqt5network5.symbols | 4 +--
debian/libqt5widgets5.symbols | 10 +++---
debian/patches/fix_build_on_x32.diff | 15 ++++++++
debian/patches/gcc_6.3.diff | 31 +++++++++++++++++
debian/patches/no_dbus_dependency.diff | 5 ++-
debian/patches/qsettings_XDG_CONFIG_DIRS.diff | 12 +++----
debian/patches/qsettings_simplify_logic.diff | 24 ++++++-------
debian/patches/series | 4 ++-
debian/rules | 9 +++--
debian/scripts/update-copyright | 4 +++
16 files changed, 147 insertions(+), 109 deletions(-)
diff --cc debian/changelog
index 540e790,d81bb5b..541d188
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,30 +1,49 @@@
- qtbase-opensource-src (5.7.1~20161021+dfsg-6ubuntu1) UNRELEASED; urgency=medium
++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.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 25 Aug 2016 11:01:48 +0000
+
- qtbase-opensource-src (5.7.1~20161021+dfsg-6) UNRELEASED; urgency=medium
+ 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
diff --cc debian/control
index b3f6308,040752b..889e83e
--- a/debian/control
+++ b/debian/control
@@@ -8,9 -7,10 +8,9 @@@ Uploaders: Sune Vuorela <sune at debian.or
Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
Timo Jyrinki <timo at debian.org>,
Dmitry Shachnev <mitya57 at debian.org>
- Build-Depends: debhelper (>= 9),
+ Build-Depends: debhelper (>= 9.20160114~),
default-libmysqlclient-dev,
dpkg-dev (>= 1.16.1),
- firebird-dev [kfreebsd-any linux-any],
freetds-dev,
gdb,
libasound2-dev [linux-any],
@@@ -63,10 -64,9 +64,10 @@@
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-Depends-Indep: libqt5sql5-sqlite (>= 5.7.1~),
+ qttools5-dev-tools (>= 5.7.1~)
Standards-Version: 3.9.8
Homepage: http://qt-project.org/
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtbase.git
@@@ -310,9 -321,10 +311,9 @@@ Depends: libgl1-mesa-dev [!armel !armhf
qtchooser,
${misc:Depends}
Recommends: libqt5opengl5-dev (= ${binary:Version})
- Suggests: libegl1-mesa-dev,
+ Suggests: default-libmysqlclient-dev,
- firebird-dev,
+ libegl1-mesa-dev,
libgl1-mesa-dev,
- libmysqlclient-dev,
libpq-dev,
libsqlite3-dev,
unixodbc-dev
@@@ -437,48 -420,8 +438,9 @@@ Description: Qt 5 base example
.
This package contains Qt base 5 examples.
- Package: qtbase5-dbg
- Priority: extra
- Architecture: any
- Multi-Arch: same
- Section: debug
- Depends: libqt5core5a (= ${binary:Version}), ${misc:Depends}
- Description: Qt 5 base library debugging symbols
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the debugging symbols for the Qt 5 base libraries.
-
- Package: qtbase5-dev-tools-dbg
- Priority: extra
- Architecture: any
- Multi-Arch: same
- Section: debug
- Depends: qt5-qmake (= ${binary:Version}),
- qtbase5-dev-tools (= ${binary:Version}),
- ${misc:Depends}
- Recommends: qtbase5-dbg
- Description: Qt 5 base binaries debugging symbols
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the debugging symbols for the Qt 5 binaries.
-
- Package: qtbase5-examples-dbg
- Priority: extra
- Architecture: any
- Section: debug
- Depends: qtbase5-examples (= ${binary:Version}), ${misc:Depends}
- Recommends: qtbase5-dbg
- Description: Qt 5 base examples debugging symbols
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the debugging symbols for the Qt 5 examples.
-
Package: qt5-default
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: qtbase5-dev, qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}
Conflicts: qt4-default
diff --cc debian/libqt5core5a.symbols
index 6d25115,5cfe8a7..0003a42
--- a/debian/libqt5core5a.symbols
+++ b/debian/libqt5core5a.symbols
@@@ -74,10 -78,10 +74,10 @@@ libQt5Core.so.5 libqt5core5a #MINVER
_Z23qt_qFindChildren_helperPK7QObjectRK7QStringRK11QMetaObjectP5QListIPvE6QFlagsIN2Qt15FindChildOptionEE at Qt_5 5.0.2
_Z24qGlobalPostedEventsCountv at Qt_5 5.0.2
_Z24qcoreStateMachineHandlerv at Qt_5 5.0.2
- (arch=!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386)_Z24qt_linux_find_symbol_sysPKc at Qt_5 5.0.2
+ (arch=linux-any)_Z24qt_linux_find_symbol_sysPKc at Qt_5 5.0.2
_Z24qt_subtract_from_timeoutii at Qt_5 5.4.2
_Z25qEnvironmentVariableIsSetPKc at Qt_5 5.0.2
- (subst)_Z26qCalculateGrowingBlockSize{size_t}{size_t}{size_t}@Qt_5 5.7.1~20161021
+ (subst)_Z26qCalculateGrowingBlockSize{size_t}{size_t}{size_t}@Qt_5 5.7.1
_Z26qt_QMetaEnum_debugOperatorR6QDebugiPK11QMetaObjectPKc at Qt_5 5.5.0
_Z27qEnvironmentVariableIsEmptyPKc at Qt_5 5.0.2
_Z28qEnvironmentVariableIntValuePKcPb at Qt_5 5.5.0
@@@ -2811,13 -2815,17 +2811,14 @@@
_ZN7QString8asprintfEPKcz at Qt_5 5.5.0
_ZN7QString8fromUcs4EPKji at Qt_5 5.0.2
_ZN7QString8truncateEi at Qt_5 5.0.2
- (arch=alpha sh4)_ZN7QString8vsprintfEPKc13__va_list_tag at Qt_5 5.4.2
- (arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390x x32)_ZN7QString8vsprintfEPKcP13__va_list_tag at Qt_5 5.3.1
- (arch=hurd-i386 i386 kfreebsd-i386 ppc64 ppc64el)_ZN7QString8vsprintfEPKcPc at Qt_5 5.3.1
- (arch=hppa m68k mips mips64el mipsel sparc64)_ZN7QString8vsprintfEPKcPv at Qt_5 5.4.2
- (arch=arm64 armel armhf)_ZN7QString8vsprintfEPKcSt9__va_list at Qt_5 5.3.0
+ (arch=any-amd64 powerpc s390x)_ZN7QString8vsprintfEPKcP13__va_list_tag at Qt_5 5.0.2
+ (arch=hurd-i386 i386 ppc64el)_ZN7QString8vsprintfEPKcPc at Qt_5 5.0.2
+ (arch=armhf arm64)_ZN7QString8vsprintfEPKcSt9__va_list at Qt_5 5.2.0
_ZN7QString9fromUtf16EPKti at Qt_5 5.0.2
- (arch=alpha)_ZN7QString9vasprintfEPKc13__va_list_tag at Qt_5 5.5.0
(arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390x x32)_ZN7QString9vasprintfEPKcP13__va_list_tag at Qt_5 5.6.1
- (arch=i386 ppc64el)_ZN7QString9vasprintfEPKcPc at Qt_5 5.5.0
- (arch=arm64 armhf)_ZN7QString9vasprintfEPKcSt9__va_list at Qt_5 5.5.0
+ (arch=hurd-i386 i386 kfreebsd-i386 ppc64 ppc64el)_ZN7QString9vasprintfEPKcPc at Qt_5 5.5.0
+ (arch=hppa m68k mips mips64el mipsel sparc64)_ZN7QString9vasprintfEPKcPv at Qt_5 5.7.1
+ (arch=arm64 armel armhf)_ZN7QString9vasprintfEPKcSt9__va_list at Qt_5 5.5.0
_ZN7QStringC1E5QChar at Qt_5 5.0.2
_ZN7QStringC1EPK5QChari at Qt_5 5.0.2
_ZN7QStringC1Ei5QChar at Qt_5 5.0.2
diff --cc debian/libqt5gui5.symbols
index c11aab1,2125ced..6dd13d3
--- a/debian/libqt5gui5.symbols
+++ b/debian/libqt5gui5.symbols
@@@ -1,8 -1,6 +1,8 @@@
- # SymbolsHelper-Confirmed: 5.7.1~20161021 amd64 armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc
+ # SymbolsHelper-Confirmed: 5.7.1 m68k
-libQt5Gui.so.5 libqt5gui5 #MINVER#
-| libqt5gui5 #MINVER#, qtbase-abi-5-7-1
+libQt5Gui.so.5 libqt5gui5 #MINVER# | libqt5gui5-gles #MINVER#
+| libqt5gui5 #MINVER# | libqt5gui5-gles #MINVER#, qtbase-abi-5-7-1
+| libqt5gui5 #MINVER#
+| libqt5gui5-gles #MINVER#
* 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 6afdd2a,09d03a9..0f6b99c
--- a/debian/rules
+++ b/debian/rules
@@@ -384,15 -316,12 +384,14 @@@ override_dh_installchangelogs
fi
override_dh_strip:
- dh_strip -pqtbase5-examples --dbg-package=qtbase5-examples-dbg
- dh_strip -pqtbase5-dev-tools --dbg-package=qtbase5-dev-tools-dbg
- dh_strip -pqt5-qmake --dbg-package=qtbase5-dev-tools-dbg
- dh_strip --remaining-packages --dbg-package=qtbase5-dbg
+ dh_strip -pqtbase5-examples --dbgsym-migration='qtbase5-examples-dbg (<< 5.7.1+dfsg-1~)'
+ dh_strip -pqtbase5-dev-tools -pqt5-qmake --dbgsym-migration='qtbase5-dev-tools-dbg (<< 5.7.1+dfsg-1~)'
+ dh_strip --remaining-packages --dbgsym-migration='qtbase5-dbg (<< 5.7.1+dfsg-1~)'
override_dh_makeshlibs:
- dh_makeshlibs -V -XlibQt5EglDeviceIntegration -XlibQt5EglFsKmsSupport -XlibQt5XcbQpa
+ # Don't uncomment until rid of -gles packages
+ #dh_makeshlibs -V -XlibQt5EglDeviceIntegration. -XlibQt5EglFsKmsSupport -XlibQt5XcbQpa
+ dh_makeshlibs -XlibQt5EglDeviceIntegration -XlibQt5EglFsKmsSupport -XlibQt5XcbQpa
override_dh_clean:
dh_clean
--
qtbase packaging
More information about the pkg-kde-commits
mailing list