[SCM] qtbase packaging branch, experimental, updated. debian/5.4.2+dfsg-4-31-g6b7bd77

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 6b7bd7785f27d88f6d348fdb66b39ab47b4ae7ac
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Jul 6 11:49:52 2015 -0300

    Move plugins to the packages they now depend upon.
    
    Solving a circular dependency.
---
 debian/changelog                           | 5 +++++
 debian/control                             | 4 ++++
 debian/libqt5egldeviceintegration5.install | 1 +
 debian/libqt5gui5.install-common           | 1 -
 debian/libqt5gui5.install-linux            | 1 -
 debian/libqt5xcbqpa5.install               | 1 +
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dbb1f39..1326376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,11 @@ qtbase-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
   * Mark/unmark private symbols.
   * Update debian/copyright.
   * Add libproxy as build dependency. We now have support for it.
+  * Move adding proper Break+Replaces:
+    - libqxcb plugin from libqt5gui5 to libqt5xcbqpa5,
+    - libqeglfs plugin from libqt5gui5 to libqt5egldeviceintegration5,
+    as they now depend on the aforementioned libraries. This solves an
+    uneeded circular dependency.
 
   [ Pino Toscano ]
   * Fix build on Hurd, by temporarly disabling waitid() in forkfd code;
diff --git a/debian/control b/debian/control
index 8e06c99..8440a48 100644
--- a/debian/control
+++ b/debian/control
@@ -285,6 +285,8 @@ 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.
@@ -297,6 +299,8 @@ 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.
diff --git a/debian/libqt5egldeviceintegration5.install b/debian/libqt5egldeviceintegration5.install
index 096c4bf..77200ea 100644
--- a/debian/libqt5egldeviceintegration5.install
+++ b/debian/libqt5egldeviceintegration5.install
@@ -1,2 +1,3 @@
 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 2546414..94904af 100644
--- a/debian/libqt5gui5.install-common
+++ b/debian/libqt5gui5.install-common
@@ -7,4 +7,3 @@ 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
diff --git a/debian/libqt5gui5.install-linux b/debian/libqt5gui5.install-linux
index 76ec7f4..f90c1ee 100644
--- a/debian/libqt5gui5.install-linux
+++ b/debian/libqt5gui5.install-linux
@@ -3,6 +3,5 @@ usr/lib/*/qt5/plugins/generic/libqevdevmouseplugin.so
 usr/lib/*/qt5/plugins/generic/libqevdevtabletplugin.so
 usr/lib/*/qt5/plugins/generic/libqevdevtouchplugin.so
 usr/lib/*/qt5/plugins/generic/libqlibinputplugin.so
-usr/lib/*/qt5/plugins/platforms/libqeglfs.so
 usr/lib/*/qt5/plugins/platforms/libqlinuxfb.so
 usr/lib/*/qt5/plugins/platforms/libqminimalegl.so
diff --git a/debian/libqt5xcbqpa5.install b/debian/libqt5xcbqpa5.install
index e2ac08e..94b8f38 100644
--- a/debian/libqt5xcbqpa5.install
+++ b/debian/libqt5xcbqpa5.install
@@ -1,2 +1,3 @@
 usr/lib/*/libQt5XcbQpa.so.*
 usr/lib/*/qt5/plugins/xcbglintegrations/*
+usr/lib/*/qt5/plugins/platforms/libqxcb.so

-- 
qtbase packaging