[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-10-ge76670e

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit a765bd49331f66d92a20c4858ffe6c473f280df8
Merge: 57003e077354779715a4b6e733f1ff074d26a9c7 ffee6908928ceedea7f3cb7425afe36c71384119
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jul 18 06:35:06 2016 +0000

    Merge branch 'master' into ubuntu+1

 debian/README.source                               |   3 +-
 debian/changelog                                   |  62 +++-
 debian/control                                     |  23 +-
 debian/libqt5gui5.install-kfreebsd                 |   4 +
 debian/patches/dbusmenu_fixes.diff                 | 364 ---------------------
 debian/patches/dbustray_fixes.diff                 |  80 -----
 debian/patches/fix_alsa_detection.patch            |  21 --
 debian/patches/fix_not_delivering_focus.patch      |  86 -----
 debian/patches/gnukfreebsd.diff                    |   2 +-
 debian/patches/gnukfreebsd_cloexec.diff            |  14 +
 debian/patches/series                              |   4 +-
 debian/qtbase5-dev.install-common                  |   9 +-
 ....install-linux => qtbase5-dev.install-kfreebsd} |   0
 debian/rules                                       |   2 +-
 14 files changed, 100 insertions(+), 574 deletions(-)

diff --cc debian/changelog
index 33c5ae2,9e8d214..f5a3d77
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,48 +1,63 @@@
- qtbase-opensource-src (5.6.0+dfsg-2ubuntu1) UNRELEASED; urgency=medium
++qtbase-opensource-src (5.6.1+dfsg-3ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release. 
 +  * Migrate symbols using the script to the Qt_5 versioning scheme.
 +  * Update symbols and bump symbols abi.
 +  * Rebase and refresh enable-tests.patch.
 +  * Rebase qnam-ubuntu-fix6.patch.
 +  * Mark private symbols.
 +  * Drop xcb_fix_parent_screen_of_embedded_windows.patch:
 +    - Fixed differently in Qt 5.6.
 +  * Tests enablement for Qt 5.6.
 +  * Add arm64 to gles archs.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 10:06:17 +0000
 +
- qtbase-opensource-src (5.6.0+dfsg-3) UNRELEASED; urgency=medium
+ 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.
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 13 Jun 2016 09:20:16 -0300
+ 
+ qtbase-opensource-src (5.6.1+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop the following patches, applied upstream:
+     - dbusmenu_fixes.diff
+     - dbustray_fixes.diff
+     - fix_not_delivering_focus.patch
+     - fix_qtdbus_deadlock.diff
+     - fix_alsa_detection.patch
+   * Drop Qt5EglDeviceIntegration.pc from qtbase5-dev.install-kfreebsd.
+     It is no longer built in Qt 5.6, and removed from install-linux file
+     too when updating the packages to 5.6.
+   * Update debian/qtbase5-dev.install-common.
+   * Update symbols files from the build log.
+   * Bump qtbase-abi version to 5-6-1.
+   * Bump Standards-Version to 3.9.8, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 09 Jun 2016 16:26:48 +0300
+ 
+ qtbase-opensource-src (5.6.0+dfsg-3) experimental; urgency=medium
+ 
+   [ Diederik de Haas ]
    * Improve the Xsession.d script so it won't fail if mesa-utils is
      not installed. Also log why glxinfo is needed for this script.
  
diff --cc debian/control
index 17de9c5,f717f53..bb936d1
--- a/debian/control
+++ b/debian/control
@@@ -482,10 -464,9 +482,11 @@@ Description: Qt 5 base examples debuggi
  
  Package: qt5-default
  Architecture: any
 +Multi-Arch: same
+ Section: libdevel
  Depends: qtbase5-dev, qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}
  Conflicts: qt4-default
 +Provides: qt-default
  Suggests: qt5-qmake, qtbase5-dev-tools
  Description: Qt 5 development defaults package
   Qt is a cross-platform C++ application framework. Qt's primary feature
diff --cc debian/patches/series
index a273bd1,0a45ca8..51ea250
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,26 -1,9 +1,24 @@@
  # Backported from upstream
- dbusmenu_fixes.diff
- dbustray_fixes.diff
  no_dbus_dependency.diff
 +fix_not_delivering_focus.patch
 +detect-indicator-application.diff
 +Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
 +xcb-Fix-drag-and-drop-to-applications-like-Emacs-and.patch
 +xcb-Fix-drag-and-drop-to-Emacs.patch
  
  # Debian specific.
  gnukfreebsd.diff
  no_htmlinfo_example.diff
  remove_privacy_breachs.diff
  link_fbclient.diff
- fix_alsa_detection.patch
+ gnukfreebsd_cloexec.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
 +fix-duplicate-qnam-finished.patch

-- 
qtbase packaging