[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-16ubuntu11-6-g84527fe

Mon May 23 08:20:52 UTC 2016

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

The following commit has been merged in the ubuntu branch:
commit 018d4979ee9ae5b5709102991b5c462724b5f08b
Merge: 935b1f9017366267b21f113262dac7afe5d15905 be8d0e7bb7f6bb4105129196f193e0dd45deac47
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon May 23 08:15:36 2016 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                   | 10 ++++++++++
 debian/control                     |  9 ++++++---
 debian/libqt5core5a.install-common |  3 ---
 debian/rules                       | 10 +---------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index 64ddaba,ad48db6..b615466

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,78 -1,13 +1,88 @@@
+ qtbase-opensource-src (5.5.1+dfsg-17) unstable; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Move qtchooser configuration files from libqt5core5a to qtchooser itself.
+   * Bump qtchooser dependency for qt5-qmake and qtbase5-dev-tools (closes:
+     #818536).
+   * Update symbols files from buildds’ logs (closes: #824971).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 22 May 2016 11:31:35 -0300
+ 
 +qtbase-opensource-src (5.5.1+dfsg-16ubuntu11) yakkety; urgency=medium
 +
 +  [ Jon Boden ]
 +  * Update symbols for ubuntuBSD (LP: #1579350)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 19 May 2016 11:18:09 +0000
 +
 +qtbase-opensource-src (5.5.1+dfsg-16ubuntu10) yakkety; urgency=medium
 +
 +  * debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
 +    - Backport from upstream 5.6 (LP: #1557915) (LP: #1559906)
 +  * Add two patches from stable Qt 5.6 branch to fix another case of 
 +    QXcbWindow crashes (LP: #1571158).
 +    - debian/patches/Fix-crash-because-of-NULL-screen-in-QXcbWindow.patch
 +    - debian/patches/QtGui-Don-t-set-a-screen-to-a-child-window.patch
 +  * Fix drag and drop issues with patches from upstream. (LP: #1577313)
 +    - debian/patches/xcb-Fix-drag-and-drop-to-Emacs.patch
 +    - debian/patches/xcb-Fix-drag-and-drop-to-applications-like-Emacs-and.patch
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 02 May 2016 07:14:37 +0000
 +
 +qtbase-opensource-src (5.5.1+dfsg-16ubuntu9) yakkety; urgency=medium
 +
 +  * Disable running the tests for a first build with ICU 57.
 +
 + -- Matthias Klose <doko at ubuntu.com>  Mon, 25 Apr 2016 20:04:55 +0200
 +
 +qtbase-opensource-src (5.5.1+dfsg-16ubuntu8) yakkety; urgency=medium
 +
 +  * No-change rebuild for libpng soname change.
 +
 + -- Matthias Klose <doko at ubuntu.com>  Sat, 23 Apr 2016 00:21:09 +0000
 +
 +qtbase-opensource-src (5.5.1+dfsg-16ubuntu7) xenial; urgency=medium
 +
 +  [ Dmitry Shachnev ]
 +  * Backport upstream change from 5.6 branch to implement better detection
 +    of indicator-application based trays. Refs LP: #1546328.
 +  * Update symbols files for symbols added in the latest patches.
 +
 +  [ Timo Jyrinki ]
 +  * debian/patches/fix-duplicate-qnam-finished.patch:
 +    - Fix multiple calls to signals of QNAM object (LP: #1564142)
 +
 + -- Dmitry Shachnev <mitya57 at ubuntu.com>  Tue, 12 Apr 2016 19:17:34 +0300
 +
 +qtbase-opensource-src (5.5.1+dfsg-16ubuntu6) xenial; urgency=medium
 +
 +  [ Alberto Mardegan ]
 +  * debian/patches/xcb_fix_parent_screen_of_embedded_windows.patch:
 +    - Fix wrong size of embedded window. Fixed in upstream Qt 5.6.
 +      (LP: #1564767)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 05 Apr 2016 13:59:17 +0000
 +
 +qtbase-opensource-src (5.5.1+dfsg-16ubuntu5) xenial; urgency=medium
 +
 +  * Rebuild against libmysqlclient20.
 +
 + -- Robie Basak <robie.basak at ubuntu.com>  Tue, 05 Apr 2016 12:57:34 +0000
 +
 +qtbase-opensource-src (5.5.1+dfsg-16ubuntu4) xenial; urgency=medium
 +
 +  * debian/patches/qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch:
 +    - Fix typos in property definitions. (LP: #1557259)
 +  * Temporarily disable a test broken by glibc upgrade (LP: #1560528). 
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 29 Mar 2016 11:30:45 +0000
 +
 +qtbase-opensource-src (5.5.1+dfsg-16ubuntu1) xenial; urgency=medium
 +
 +  * Merge with Debian 5.5.1+dfsg-16.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 07 Mar 2016 09:17:45 +0000
 +
  qtbase-opensource-src (5.5.1+dfsg-16) unstable; urgency=medium
  
    * Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection.
diff --cc debian/control
index b4c13e3,747face..ef0c125
--- a/debian/control
+++ b/debian/control
@@@ -476,10 -461,8 +479,10 @@@ Description: Qt 5 base examples debuggi
  
  Package: qt5-default
  Architecture: any
 +Multi-Arch: same
- Depends: qtbase5-dev, qtchooser, ${misc:Depends}
+ 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/rules
index 407a415,6546949..d2ac68c
--- a/debian/rules
+++ b/debian/rules
@@@ -305,24 -252,10 +305,16 @@@ endi
  	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
  		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
  
- 	# Add a configuration for qtchooser
- 	mkdir -p $(CURDIR)/debian/tmp/usr/share/qtchooser
- 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf
- 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf
- 
- 	# Ship 5.conf and qt5.conf for this arch, and a default.conf.
- 	# 5.conf makes calling qtchooser prettier.
+ 	# Configuration file for qt5-default package
  	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
- 	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/5.conf
- 	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/qt5.conf
  	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
  
 +ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(x86_architectures)))
 +	# ship the qt5-qmake-arm-linux-gnueabihf in /usr/bin
 +	mkdir -p $(CURDIR)/debian/tmp/usr/bin
 +	cp $(CURDIR)/bin/qt5-qmake-arm-linux-gnueabihf $(CURDIR)/debian/tmp/usr/bin
 +endif
 +
  	# Remove leftover directories
  	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5 -depth -type d \( -false \
  	  -o -name .moc\* \

-- 
qtbase packaging

