[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-12-7-g1faad75

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 0e5af1cefd8a771c1f3ab418abb1dc1e31c9d150
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jan 19 01:37:57 2016 -0300

    Do the merge for libqt5xcbqpa5.
---
 debian/changelog                 |  4 +++-
 debian/control                   | 21 +++------------------
 debian/libqt5gui5.install-common |  3 +++
 debian/libqt5xcbqpa5.install     |  3 ---
 debian/rules                     |  2 +-
 5 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65ce5e6..2ee3857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 qtbase-opensource-src (5.5.1+dfsg-13) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Merge platforms plugins back into libqt5gui5: libqt5egldeviceintegration5.
+  * Merge platforms plugins back into libqt5gui5: libqt5egldeviceintegration5
+    and libqt5xcbqpa5.
     - Avoid creating shlibs and symbols files for the private libraries they
       ship.
+    - Add proper Breaks+Replaces.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Jan 2016 01:06:25 -0300
 
diff --git a/debian/control b/debian/control
index d16529f..f4efffc 100644
--- a/debian/control
+++ b/debian/control
@@ -90,9 +90,9 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}
-Recommends: libqt5svg5, libqt5xcbqpa5
-Breaks: libqt5egldeviceintegration5 (<< 5.5.1+dfsg-13~)
-Replaces: libqt5egldeviceintegration5 (<< 5.5.1+dfsg-13~)
+Recommends: libqt5svg5
+Breaks: libqt5egldeviceintegration5 (<< 5.5.1+dfsg-13~), libqt5xcbqpa5 (<< 5.5.1+dfsg-13~)
+Replaces: libqt5egldeviceintegration5 (<< 5.5.1+dfsg-13~), libqt5xcbqpa5 (<< 5.5.1+dfsg-13~)
 Suggests: libqt5libqgtk2, qt5-image-formats-plugins, qtwayland5
 Description: Qt 5 GUI module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -296,21 +296,6 @@ Description: Qt 5 print support module
  The QtPrintSupport module provides classes to make printing easier and
  portable.
 
-Package: libqt5xcbqpa5
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt5gui5 (<< 5.5.0+dfsg-1~)
-Replaces: libqt5gui5 (<< 5.5.0+dfsg-1~)
-Description: Qt 5 XCB platform module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This module provides XCB integration used on regular desktop Linux platforms.
- Applications that can't work in anything but X should consider depending on
- this lib.
-
 Package: qtbase5-dev
 Architecture: any
 Multi-Arch: same
diff --git a/debian/libqt5gui5.install-common b/debian/libqt5gui5.install-common
index 94904af..a14eb13 100644
--- a/debian/libqt5gui5.install-common
+++ b/debian/libqt5gui5.install-common
@@ -1,4 +1,5 @@
 usr/lib/*/libQt5Gui.so.*
+usr/lib/*/libQt5XcbQpa.so.*
 usr/lib/*/qt5/plugins/generic/libqtuiotouchplugin.so
 usr/lib/*/qt5/plugins/imageformats/libqgif.so
 usr/lib/*/qt5/plugins/imageformats/libqico.so
@@ -7,3 +8,5 @@ usr/lib/*/qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin
 usr/lib/*/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
 usr/lib/*/qt5/plugins/platforms/libqminimal.so
 usr/lib/*/qt5/plugins/platforms/libqoffscreen.so
+usr/lib/*/qt5/plugins/platforms/libqxcb.so
+usr/lib/*/qt5/plugins/xcbglintegrations/*
diff --git a/debian/libqt5xcbqpa5.install b/debian/libqt5xcbqpa5.install
deleted file mode 100644
index 079db8a..0000000
--- a/debian/libqt5xcbqpa5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libQt5XcbQpa.so.*
-usr/lib/*/qt5/plugins/platforms/libqxcb.so
-usr/lib/*/qt5/plugins/xcbglintegrations/*
diff --git a/debian/rules b/debian/rules
index 278baca..5d4ea15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -328,7 +328,7 @@ override_dh_strip:
 	dh_strip --remaining-packages --dbg-package=qtbase5-dbg
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V -plibqt5gui5 -XlibQt5EglDeviceIntegration.so
+	dh_makeshlibs -V -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
 	dh_makeshlibs -V --remaining-packages
 
 	# Check for private symbols not marked as such. Be verbose.

-- 
qtbase packaging