[SCM] qtbase packaging branch, experimental, updated. debian/5.6.1+dfsg-3-16-g36f90a8

Thu Jun 23 19:33:59 UTC 2016

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

The following commit has been merged in the experimental branch:
commit 36f90a8f37c6f2368ca25a11792cddfb98a0740e
Merge: fb1a6d70b99f943b1b3904b221e4bd9d00764cae ffee6908928ceedea7f3cb7425afe36c71384119
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jun 23 22:33:15 2016 +0300

    Merge branch master into experimental.

 debian/changelog                        | 16 ++++++++++++++++
 debian/control                          |  6 ++++--
 debian/libqt5core5a.symbols             |  8 ++++----
 debian/libqt5dbus5.symbols              |  2 +-
 debian/libqt5gui5.symbols               |  4 ++--
 debian/libqt5network5.symbols           |  2 +-
 debian/libqt5widgets5.symbols           |  2 +-
 debian/patches/gnukfreebsd_cloexec.diff | 14 ++++++++++++++
 debian/patches/series                   |  1 +
 9 files changed, 44 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 6a6dbf2,9e8d214..141f93a

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,19 +1,47 @@@
 +qtbase-opensource-src (5.7.0+dfsg-1) UNRELEASED; urgency=medium
 +
 +  [ Dmitry Shachnev ]
 +  * New upstream release.
 +  * Drop debian/scripts/migrate-symbols.py, no longer needed.
 +  * Drop lib/fonts/* from excluded files, these are no longer shipped
 +    (since upstream commit c5ceabb9a1caf6b9).
 +  * Refresh patches for the new release.
 +  * Update for upstream GTK+ 3 port:
 +    - Build-depend on libgtk-3-dev.
 +    - Rename libqt5libqgtk2 to qt5-gtk-platformtheme.
 +    - Make it a recommendation of libqt5gui5 rather than a suggestion.
 +  * Update debian/qtbase5-dev.install-common for the new release.
 +  * Install libQt5EglFsKmsSupport library in libqt5gui5, the same way as
 +    libQt5EglDeviceIntegration.
 +  * Update symbols files from amd64 and i386 build logs.
 +  * Merge two dh_makeshlibs calls, so that only one build is needed to get
 +    the symbols diffs.
 +  * Update debian/copyright:
 +    - Libraries code is now licensed under LGPL-3 or GPL-2+.
 +    - Tools and tests are now licensed under GPL-3 with exceptions.
 +    - Examples and documentation are still licensed under 3-clause BSD.
 +  * Update clean rules to prevent deleting test data.
 +  * Drop obsolete Breaks/Replaces.
 +  * Bump qtbase-abi version to 5-7-0.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jun 2016 11:38:32 +0300
 +
+ qtbase-opensource-src (5.6.1+dfsg-3) unstable; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Make libqtcore5a break libqt5scintilla2-12v5 (<< 2.9.2+dfsg-2~), pointed
+     out by Scott Kitterman.
+ 
+   [ Dmitry Shachnev ]
+   * Move qt5-default into libdevel section (like qtchooser itself; closes:
+     #827659).
+   * Move mesa-utils from Depends to Recommends (closes: #827896).
+   * Add a (temporary) patch to fix the QProcessPrivate::createPipe issue on
+     GNU/kFreeBSD (closes: #827935).
+   * Update symbols files from buildds’ logs.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 23 Jun 2016 21:57:01 +0300
+ 
  qtbase-opensource-src (5.6.1+dfsg-2) unstable; urgency=medium
  
    * Upload to unstable.
diff --cc debian/control
index e8146af,f717f53..b028218
--- a/debian/control
+++ b/debian/control
@@@ -80,6 -80,8 +80,7 @@@ Provides: qtbase-abi-5-7-
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Recommends: qttranslations5-l10n
  Suggests: libthai0
 -Breaks: libqt5core5 (<< 5.2.0+dfsg~), libqt5scintilla2-12v5 (<< 2.9.2+dfsg-2~)
 -Replaces: libqt5core5 (<< 5.2.0+dfsg~)
++Breaks: libqt5scintilla2-12v5 (<< 2.9.2+dfsg-2~)
  Description: Qt 5 core module
   Qt is a cross-platform C++ application framework. Qt's primary feature
   is its rich set of widgets that provide standard GUI functionality.
@@@ -90,8 -92,8 +91,8 @@@ Package: libqt5gui
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
- Depends: fontconfig, mesa-utils, ${misc:Depends}, ${shlibs:Depends}
- Recommends: libqt5svg5, qt5-gtk-platformtheme
+ Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}
 -Recommends: libqt5svg5, mesa-utils
++Recommends: libqt5svg5, mesa-utils, qt5-gtk-platformtheme
  Breaks: libqt5egldeviceintegration5 (<< 5.6.0~beta+dfsg-5~),
          libqt5xcbqpa5 (<< 5.6.0~beta+dfsg-5~)
  Replaces: libqt5egldeviceintegration5 (<< 5.6.0~beta+dfsg-5~),
diff --cc debian/libqt5core5a.symbols
index c9d4f8a,b50f512..4341fcf
--- a/debian/libqt5core5a.symbols
+++ b/debian/libqt5core5a.symbols
@@@ -118,12 -116,12 +118,12 @@@ libQt5Core.so.5 libqt5core5a #MINVER
   _Z5qHashRK9QMimeTypej at Qt_5 5.6.0~beta
   _Z5qHashRK9QUrlQueryj at Qt_5 5.6.0~beta
   _Z5qHashdj at Qt_5 5.3.0
-  (arch=!alpha !powerpc !ppc64 !ppc64el !s390x)_Z5qHashej at Qt_5 5.3.0
+  (arch=!alpha !powerpc !powerpcspe !ppc64 !ppc64el !s390x)_Z5qHashej at Qt_5 5.3.0
   _Z5qHashfj at Qt_5 5.3.0
-  (arch=alpha powerpc ppc64 ppc64el s390x)_Z5qHashgj at Qt_5 5.4.0
+  (arch=alpha powerpc powerpcspe ppc64 ppc64el s390x)_Z5qHashgj at Qt_5 5.6.1
   _Z5qQNaNv at Qt_5 5.0.2
   _Z5qSNaNv at Qt_5 5.0.2
 - _Z5qdtoadiiPiS_PPcS1_ at Qt_5 5.0.2
 + _Z5qdtoadPiS_ at Qt_5 5.7.0
   _Z5qrandv at Qt_5 5.0.2
   _Z5resetR11QTextStream at Qt_5 5.0.2
   _Z5rightR11QTextStream at Qt_5 5.0.2
diff --cc debian/libqt5widgets5.symbols
index 909af1f,b827569..97bc799
--- a/debian/libqt5widgets5.symbols
+++ b/debian/libqt5widgets5.symbols
@@@ -7563,11 -7489,7 +7563,11 @@@ libQt5Widgets.so.5 libqt5widgets5 #MINV
   _ZNK9QUndoView5groupEv at Qt_5 5.0.2
   _ZNK9QUndoView5stackEv at Qt_5 5.0.2
   _ZNK9QUndoView9cleanIconEv at Qt_5 5.0.2
 + (optional=templinst)_ZNSt17_Temporary_bufferIP5QRectS0_EC1ES1_S1_ at Qt_5 5.7.0
 + (optional=templinst)_ZNSt17_Temporary_bufferIP5QRectS0_EC2ES1_S1_ at Qt_5 5.7.0
 + (optional=templinst)_ZNSt3_V28__rotateIP5QRectEET_S3_S3_S3_St26random_access_iterator_tag at Qt_5 5.7.0
 + (optional=templinst)_ZNSt3_V28__rotateIPiEET_S2_S2_S2_St26random_access_iterator_tag at Qt_5 5.7.0
-  (optional=templinst|arch=!amd64)_ZSt4swapIN8QVariant7PrivateEEvRT_S3_ at Qt_5 5.6.1
+  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64 !x32)_ZSt4swapIN8QVariant7PrivateEEvRT_S3_ at Qt_5 5.6.1
   _ZTI10QBoxLayout at Qt_5 5.0.2
   _ZTI10QCompleter at Qt_5 5.0.2
   _ZTI10QLCDNumber at Qt_5 5.0.2

-- 
qtbase packaging

