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

[Lisandro Damián Nicanor Pérez]

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

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

    Merge QPA plugin libqt5egldeviceintegration5. into libqt5gui5.
---
 debian/changelog                           |  2 ++
 debian/control                             | 16 ++--------------
 debian/libqt5egldeviceintegration5.install |  3 ---
 debian/libqt5gui5.install-common           |  3 +++
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e2e6cb..b579e78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 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.
 
  -- 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 9afe42f..d16529f 100644
--- a/debian/control
+++ b/debian/control
@@ -91,6 +91,8 @@ 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~)
 Suggests: libqt5libqgtk2, qt5-image-formats-plugins, qtwayland5
 Description: Qt 5 GUI module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -294,20 +296,6 @@ Description: Qt 5 print support module
  The QtPrintSupport module provides classes to make printing easier and
  portable.
 
-Package: libqt5egldeviceintegration5
-Architecture: linux-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 EGL device integration
- 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 integration with different EGL devices through
- specific plugins for kms, x11, etc.
-
 Package: libqt5xcbqpa5
 Architecture: any
 Multi-Arch: same
diff --git a/debian/libqt5egldeviceintegration5.install b/debian/libqt5egldeviceintegration5.install
deleted file mode 100644
index 77200ea..0000000
--- a/debian/libqt5egldeviceintegration5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libQt5EglDeviceIntegration.so.*
-usr/lib/*/qt5/plugins/egldeviceintegrations/*
-usr/lib/*/qt5/plugins/platforms/libqeglfs.so
diff --git a/debian/libqt5gui5.install-common b/debian/libqt5gui5.install-common
index 94904af..63cf27f 100644
--- a/debian/libqt5gui5.install-common
+++ b/debian/libqt5gui5.install-common
@@ -7,3 +7,6 @@ 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/*/libQt5EglDeviceIntegration.so.*
+usr/lib/*/qt5/plugins/egldeviceintegrations/*
+usr/lib/*/qt5/plugins/platforms/libqeglfs.so

-- 
qtbase packaging