[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.7.1+dfsg-2ubuntu1

Tue Jan 10 07:32:11 UTC 2017

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=31da0dc

The following commit has been merged in the ubuntu branch:
commit 31da0dc2ca4adab0d6958ea2577cd5afbce1bf56
Merge: cb343ca0335f3c4a3606c7aebe850b81b86d1a60 4be3c9f12c25a4688cad030ad1b5d07e1043e030
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Nov 7 09:56:27 2016 +0000

    Merge branch 'master' into ubuntu+1

 debian/changelog                              |  53 +++-
 debian/control                                |   9 +-
 debian/copyright                              | 240 ++++++++++-------
 debian/libqt5concurrent5.symbols              |   3 +-
 debian/libqt5core5a.symbols                   |  24 +-
 debian/libqt5dbus5.symbols                    |   7 +-
 debian/libqt5gui5.symbols                     |  11 +-
 debian/libqt5network5.symbols                 |   7 +-
 debian/libqt5opengl5.symbols                  |   4 +-
 debian/libqt5printsupport5.symbols            |   3 +-
 debian/libqt5sql5.symbols                     |   3 +-
 debian/libqt5test5.symbols                    |   5 +-
 debian/libqt5widgets5.symbols                 |  10 +-
 debian/libqt5xml5.symbols                     |   3 +-
 debian/patches/qdevicediscovery_dummy.diff    |  34 ---
 debian/patches/qsettings_XDG_CONFIG_DIRS.diff | 171 ++++++++++++
 debian/patches/qsettings_simplify_logic.diff  | 372 ++++++++++++++++++++++++++
 debian/patches/series                         |   3 +-
 debian/qtbase5-dev.install-common             |   2 +
 debian/rules                                  |   5 +
 debian/scripts/update-copyright               |  10 +-
 21 files changed, 801 insertions(+), 178 deletions(-)

diff --cc debian/changelog
index 53a0ef6,edb33bb..5a62586

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,51 +1,65 @@@
- qtbase-opensource-src (5.7.0+dfsg-3ubuntu1) UNRELEASED; urgency=medium
++qtbase-opensource-src (5.7.1~20161021+dfsg-6ubuntu1) 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
 +  * Update symbols and mark private ones.
 +  * Adjust tests enablement patch for Qt 5.7.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 25 Aug 2016 11:01:48 +0000
 +
- qtbase-opensource-src (5.7.0+dfsg-4) UNRELEASED; urgency=medium
+ qtbase-opensource-src (5.7.1~20161021+dfsg-6) UNRELEASED; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Make libqt5network5 depend on libssl1.0.2. It will crash when
+     only newer libssl versions are installed.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 04 Nov 2016 20:29:15 +0300
+ 
+ qtbase-opensource-src (5.7.1~20161021+dfsg-5) unstable; urgency=medium
+ 
+   * Switch libssl-dev to libssl1.0-dev. We can't yet use libssl 1.1.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 02 Nov 2016 19:09:23 -0300
+ 
+ qtbase-opensource-src (5.7.1~20161021+dfsg-4) unstable; urgency=medium
+ 
+   * Drop Build-Conflicts: libmariadbclient-dev, should be no longer needed.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 01 Nov 2016 16:20:07 +0300
+ 
+ qtbase-opensource-src (5.7.1~20161021+dfsg-3) unstable; urgency=medium
+ 
+   * Change build-dependency libmysqlclient-dev → default-libmysqlclient-dev.
+   * Upload to unstable.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 01 Nov 2016 13:47:12 +0300
+ 
+ qtbase-opensource-src (5.7.1~20161021+dfsg-2) experimental; urgency=medium
+ 
+   * Backport two patches to add proper support for XDG_CONFIG_DIRS to
+     QSettings; needed for LXQt transition (qsettings_simplify_logic.diff,
+     qsettings_XDG_CONFIG_DIRS.diff).
+   * Configure with -no-use-gold-linker on i386 to work around build failures
+     of qtscript and qtgraphicaleffects (see binutils bug #842304).
+   * Update symbols files from buildds’ logs.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 28 Oct 2016 17:04:09 +0300
+ 
+ qtbase-opensource-src (5.7.1~20161021+dfsg-1) experimental; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * New upstream snapshot.
+   * Drop debian/patches/qdevicediscovery_dummy.diff, applied upstream.
+   * Update the copyright script to use a stricter formula for GPL-2 license.
+   * Update debian/copyright.
+   * Install the qtpng static library in qtbase5-dev (following upstream).
+   * Update the symbols files from amd64 build log.
+   * Bump qtbase-abi version to 5-7-1.
  
    [ Lisandro Damián Nicanor Pérez Meyer ]
    * Require pkg-kde-tools (>= 0.15.17~) to allow using backported versions.
diff --cc debian/control
index eab36a9,41a6d80..6d896cb
--- a/debian/control
+++ b/debian/control
@@@ -9,7 -8,9 +9,8 @@@ Uploaders: Sune Vuorela <sune at debian.or
             Timo Jyrinki <timo at debian.org>,
             Dmitry Shachnev <mitya57 at debian.org>
  Build-Depends: debhelper (>= 9),
+                default-libmysqlclient-dev,
                 dpkg-dev (>= 1.16.1),
 -               firebird-dev [kfreebsd-any linux-any],
                 freetds-dev,
                 gdb,
                 libasound2-dev [linux-any],
diff --cc debian/libqt5concurrent5.symbols
index 33bb8ad,8eaa6b8..a1cb53a
--- a/debian/libqt5concurrent5.symbols
+++ b/debian/libqt5concurrent5.symbols
@@@ -1,6 -1,7 +1,7 @@@
 -# SymbolsHelper-Confirmed: 5.7.0 amd64
 +# SymbolsHelper-Confirmed: 5.7.0 amd64 arm64 armhf i386 powerpc ppc64el
  libQt5Concurrent.so.5 libqt5concurrent5 #MINVER#
- | libqt5concurrent5 #MINVER#, qtbase-abi-5-7-0
+ | libqt5concurrent5 #MINVER#, qtbase-abi-5-7-1
+ * 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
   Qt_5.2 at Qt_5.2 5.6.0~beta
diff --cc debian/libqt5core5a.symbols
index 58acf7f,1a5b55c..6d25115
--- a/debian/libqt5core5a.symbols
+++ b/debian/libqt5core5a.symbols
@@@ -73,9 -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
   _Z26qt_QMetaEnum_debugOperatorR6QDebugiPK11QMetaObjectPKc at Qt_5 5.5.0
   _Z27qEnvironmentVariableIsEmptyPKc at Qt_5 5.0.2
   _Z28qEnvironmentVariableIntValuePKcPb at Qt_5 5.5.0
diff --cc debian/libqt5gui5.symbols
index cdbfde6,2ed0283..c11aab1
--- a/debian/libqt5gui5.symbols
+++ b/debian/libqt5gui5.symbols
@@@ -1,8 -1,7 +1,9 @@@
- # SymbolsHelper-Confirmed: 5.7.0 amd64 arm64 armhf i386 powerpc ppc64el
+ # SymbolsHelper-Confirmed: 5.7.1~20161021 amd64 armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc
 -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-0
++| 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
   Qt_5.2 at Qt_5.2 5.6.0~beta
diff --cc debian/libqt5opengl5.symbols
index ac797d7,45be276..43a46d6
--- a/debian/libqt5opengl5.symbols
+++ b/debian/libqt5opengl5.symbols
@@@ -1,6 -1,7 +1,8 @@@
 -# SymbolsHelper-Confirmed: 5.7.0 amd64
 +# SymbolsHelper-Confirmed: 5.7.0 amd64 arm64 armhf i386 powerpc ppc64el
 +libQt5OpenGL.so.5 libqt5opengl5 #MINVER# | libqt5opengl5-gles #MINVER#
- | libqt5opengl5 #MINVER# | libqt5opengl5-gles #MINVER#, qtbase-abi-5-7-0
++| libqt5opengl5 #MINVER# | libqt5opengl5-gles #MINVER#, qtbase-abi-5-7-1
+ libQt5OpenGL.so.5 libqt5opengl5 #MINVER#
 -| libqt5opengl5 #MINVER#, qtbase-abi-5-7-1
+ * 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
   Qt_5.2 at Qt_5.2 5.6.0~beta
diff --cc debian/libqt5printsupport5.symbols
index bb3d972,b3bddf6..e3b1ca1
--- a/debian/libqt5printsupport5.symbols
+++ b/debian/libqt5printsupport5.symbols
@@@ -1,6 -1,7 +1,7 @@@
 -# SymbolsHelper-Confirmed: 5.7.0 amd64
 +# SymbolsHelper-Confirmed: 5.7.0 amd64 arm64 armhf i386 powerpc ppc64el
  libQt5PrintSupport.so.5 libqt5printsupport5 #MINVER#
- | libqt5printsupport5 #MINVER#, qtbase-abi-5-7-0
+ | libqt5printsupport5 #MINVER#, qtbase-abi-5-7-1
+ * 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
   Qt_5.2 at Qt_5.2 5.6.0~beta
diff --cc debian/libqt5sql5.symbols
index 5416f6a,76e9590..4dddd80
--- a/debian/libqt5sql5.symbols
+++ b/debian/libqt5sql5.symbols
@@@ -1,6 -1,7 +1,7 @@@
 -# SymbolsHelper-Confirmed: 5.7.0 amd64
 +# SymbolsHelper-Confirmed: 5.7.0 amd64 arm64 armhf i386 powerpc ppc64el
  libQt5Sql.so.5 libqt5sql5 #MINVER#
- | libqt5sql5 #MINVER#, qtbase-abi-5-7-0
+ | libqt5sql5 #MINVER#, qtbase-abi-5-7-1
+ * 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
   Qt_5.2 at Qt_5.2 5.6.0~beta
diff --cc debian/libqt5xml5.symbols
index 1862cd4,2fd56c2..d025865
--- a/debian/libqt5xml5.symbols
+++ b/debian/libqt5xml5.symbols
@@@ -1,6 -1,7 +1,7 @@@
 -# SymbolsHelper-Confirmed: 5.7.0 amd64
 +# SymbolsHelper-Confirmed: 5.7.0 amd64 arm64 armhf i386 powerpc ppc64el
  libQt5Xml.so.5 libqt5xml5 #MINVER#
- | libqt5xml5 #MINVER#, qtbase-abi-5-7-0
+ | libqt5xml5 #MINVER#, qtbase-abi-5-7-1
+ * 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
   Qt_5.2 at Qt_5.2 5.6.0~beta
diff --cc debian/patches/series
index d4605c4,a82eee8..c279db0
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,7 +1,11 @@@
  # Backported from upstream
+ qsettings_simplify_logic.diff
+ qsettings_XDG_CONFIG_DIRS.diff
  no_dbus_dependency.diff
 +fix-scalable-bitmap-factor-caching.patch
 +xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch
 +#QDBusServer-delay-processing-of-D-Bus-messages.patch
 +Make-sure-connection-is-not-null-before-using-it.patch
  
  # Debian specific.
  gnukfreebsd.diff
@@@ -11,14 -9,4 +13,13 @@@ no_htmlinfo_example.dif
  remove_privacy_breachs.diff
  link_fbclient.diff
  gnukfreebsd_cloexec.diff
- qdevicediscovery_dummy.diff
  armv4.diff
 +
 +# Ubuntu specific.
 +qt5-qmake-arm-linux-gnueabihf
 +Add-workaround-for-GL-on-Android-emulator.patch
 +enable-tests.patch
 +skip-largefile-test-s390x.patch
 +net-bearer-nm-disconnect-ap-signals7.patch
 +qnam-ubuntu-fix6.patch
 +#disable_overlay_scrollbars.diff

-- 
qtbase packaging

