[SCM] qtbase packaging branch, master, updated. debian/5.0.0-1-31-g468eaaf

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 3fa56213754de87b19575df331afc8f5f458611a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Apr 7 15:50:31 2013 -0300

    Separate common from linux stuff for gui and network.
---
 debian/libqt5gui5.install                          |   13 -------------
 debian/libqt5gui5.install.common                   |    8 ++++++++
 debian/libqt5gui5.install.linux                    |    4 ++++
 ...work5.install => libqt5network5.install.common} |    1 -
 debian/libqt5network5.install.linux                |    2 ++
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/libqt5gui5.install b/debian/libqt5gui5.install
deleted file mode 100644
index 6d06e5c..0000000
--- a/debian/libqt5gui5.install
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/lib/*/libQt5Gui.so.*
-usr/lib/*/qt5/plugins/generic/libqevdevkeyboardplugin.so
-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/imageformats/libqgif.so
-usr/lib/*/qt5/plugins/imageformats/libqico.so
-usr/lib/*/qt5/plugins/imageformats/libqjpeg.so
-usr/lib/*/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
-usr/lib/*/qt5/plugins/platforminputcontexts/libmaliitplatforminputcontextplugin.so
-usr/lib/*/qt5/plugins/platforms/libqlinuxfb.so
-usr/lib/*/qt5/plugins/platforms/libqminimal.so
-usr/lib/*/qt5/plugins/platforms/libqxcb.so
diff --git a/debian/libqt5gui5.install.common b/debian/libqt5gui5.install.common
new file mode 100644
index 0000000..18a3398
--- /dev/null
+++ b/debian/libqt5gui5.install.common
@@ -0,0 +1,8 @@
+usr/lib/*/libQt5Gui.so.*
+sr/lib/*/qt5/plugins/imageformats/libqgif.so
+usr/lib/*/qt5/plugins/imageformats/libqico.so
+usr/lib/*/qt5/plugins/imageformats/libqjpeg.so
+usr/lib/*/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
+usr/lib/*/qt5/plugins/platforminputcontexts/libmaliitplatforminputcontextplugin.so
+usr/lib/*/qt5/plugins/platforms/libqminimal.so
+usr/lib/*/qt5/plugins/platforms/libqxcb.so
diff --git a/debian/libqt5gui5.install.linux b/debian/libqt5gui5.install.linux
new file mode 100644
index 0000000..b377d1d
--- /dev/null
+++ b/debian/libqt5gui5.install.linux
@@ -0,0 +1,4 @@
+usr/lib/*/qt5/plugins/generic/libqevdevkeyboardplugin.so
+usr/lib/*/qt5/plugins/generic/libqevdevmouseplugin.so
+usr/lib/*/qt5/plugins/generic/libqevdevtabletplugin.so
+usr/lib/*/qt5/plugins/generic/libqevdevtouchplugin.so
diff --git a/debian/libqt5network5.install b/debian/libqt5network5.install.common
similarity index 71%
rename from debian/libqt5network5.install
rename to debian/libqt5network5.install.common
index a5ecb59..ea840fa 100644
--- a/debian/libqt5network5.install
+++ b/debian/libqt5network5.install.common
@@ -1,4 +1,3 @@
 usr/lib/*/libQt5Network.so.*
-usr/lib/*/qt5/plugins/bearer/libqconnmanbearer.so
 usr/lib/*/qt5/plugins/bearer/libqgenericbearer.so
 usr/lib/*/qt5/plugins/bearer/libqnmbearer.so
diff --git a/debian/libqt5network5.install.linux b/debian/libqt5network5.install.linux
new file mode 100644
index 0000000..b87a3d6
--- /dev/null
+++ b/debian/libqt5network5.install.linux
@@ -0,0 +1,2 @@
+usr/lib/*/qt5/plugins/bearer/libqconnmanbearer.so
+usr/lib/*/qt5/plugins/bearer/libqnmbearer.so

-- 
qtbase packaging