[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.1+dfsg-13-86-g375b3eb

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit dbe269939d5b30fabf7cd4f57bb7e8e1b748925c
Merge: 68e4ea1fe5940788824915fc94fe78a40de7cf42 e79fc72daa04bf835b673294700f290eb81e75b2
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Feb 5 07:16:45 2016 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                                   |  20 +-
 debian/control                                     |  52 +--
 debian/libqt5egldeviceintegration5.install         |   3 -
 .../libqt5egldeviceintegration5.lintian-overrides  |   3 -
 debian/libqt5egldeviceintegration5.symbols         | 186 ---------
 debian/libqt5gui5.install-common                   |   3 +
 debian/libqt5gui5.install-linux                    |   3 +
 debian/libqt5gui5.lintian-overrides                |  18 +
 debian/libqt5xcbqpa5.install                       |   3 -
 debian/libqt5xcbqpa5.lintian-overrides             |   3 -
 debian/libqt5xcbqpa5.symbols                       | 415 ---------------------
 debian/rules                                       |   6 +-
 12 files changed, 65 insertions(+), 650 deletions(-)

diff --cc debian/changelog
index def4467,d6fd8f6..4978433
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,21 +1,30 @@@
- qtbase-opensource-src (5.5.1+dfsg-12ubuntu1) UNRELEASED; urgency=medium
++qtbase-opensource-src (5.5.1+dfsg-13ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Merge with Debian.
 +  * debian/patches/series: move a patch to under correct subheading
 +  * Backport XCB patch related to screen disconnection handling QTBUG-42985:
 +    - xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 08:36:13 +0000
 +
+ qtbase-opensource-src (5.5.1+dfsg-13) unstable; urgency=medium
+ 
+   * Fix URLs pointing to our "How to package Qt based stuff" page
+     (Closes: #810282). Thanks Jakob Haufe for the pointer.
+   * Merge platforms plugins back into libqt5gui5: libqt5egldeviceintegration5
+     and libqt5xcbqpa5(Closes: #796956, #802715, #809172, #809176).
+     - Avoid creating shlibs and symbols files for the private libraries they
+       ship.
+     - Add lintian overrides for the plugins's private libs. See the override's
+       description for more info.
+     - Add proper Breaks+Replaces.
+     - Remove other mentions of them.
+     - Add a transitional dummy package for libqt5xcbqpa5 as it's the only one
+       which has rdeps. We can safely remove it after the rdeps are fixed
+       (they are manually added).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 20 Jan 2016 18:06:21 -0300
+ 
  qtbase-opensource-src (5.5.1+dfsg-12) unstable; urgency=medium
  
    * Backport xcb_dont_select_XInput_events_on_root_window.patch
diff --cc debian/rules
index 50765b4,5d4ea15..214cc90
--- a/debian/rules
+++ b/debian/rules
@@@ -387,9 -328,8 +387,11 @@@ override_dh_strip
  	dh_strip --remaining-packages --dbg-package=qtbase5-dbg
  
  override_dh_makeshlibs:
 -	dh_makeshlibs -V -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
 -	dh_makeshlibs -V --remaining-packages
 +	# Don't uncomment until rid of -gles packages
- 	#dh_makeshlibs -V
- 	dh_makeshlibs
++	#dh_makeshlibs -V -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
++	#dh_makeshlibs -V --remaining-packages
++	dh_makeshlibs -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
++	dh_makeshlibs --remaining-packages
  
  	# Check for private symbols not marked as such. Be verbose.
  	pkgkde-mark-private-symbols debian/qtbase5-private-dev/usr/include

-- 
qtbase packaging