[SCM] qtbase packaging branch, master, updated. b0f9a45cb5024ef7bfb6ed9b72e76428fa8daca0

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit b0f9a45cb5024ef7bfb6ed9b72e76428fa8daca0
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Dec 18 06:41:49 2012 +0000

    Use recommended archdir, add ARM specific install files for the EGL backends.
---
 ...libqt5gui5.install => libqt5gui5.install.armel} |    2 ++
 ...libqt5gui5.install => libqt5gui5.install.armhf} |    2 ++
 debian/rules                                       |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/libqt5gui5.install b/debian/libqt5gui5.install.armel
similarity index 87%
copy from debian/libqt5gui5.install
copy to debian/libqt5gui5.install.armel
index 6d06e5c..98de602 100644
--- a/debian/libqt5gui5.install
+++ b/debian/libqt5gui5.install.armel
@@ -11,3 +11,5 @@ usr/lib/*/qt5/plugins/platforminputcontexts/libmaliitplatforminputcontextplugin.
 usr/lib/*/qt5/plugins/platforms/libqlinuxfb.so
 usr/lib/*/qt5/plugins/platforms/libqminimal.so
 usr/lib/*/qt5/plugins/platforms/libqxcb.so
+usr/lib/*/qt5/plugins/platforms/libqminimalegl.so
+usr/lib/*/qt5/plugins/platforms/libqeglfs.so
diff --git a/debian/libqt5gui5.install b/debian/libqt5gui5.install.armhf
similarity index 87%
copy from debian/libqt5gui5.install
copy to debian/libqt5gui5.install.armhf
index 6d06e5c..98de602 100644
--- a/debian/libqt5gui5.install
+++ b/debian/libqt5gui5.install.armhf
@@ -11,3 +11,5 @@ usr/lib/*/qt5/plugins/platforminputcontexts/libmaliitplatforminputcontextplugin.
 usr/lib/*/qt5/plugins/platforms/libqlinuxfb.so
 usr/lib/*/qt5/plugins/platforms/libqminimal.so
 usr/lib/*/qt5/plugins/platforms/libqxcb.so
+usr/lib/*/qt5/plugins/platforms/libqminimalegl.so
+usr/lib/*/qt5/plugins/platforms/libqeglfs.so
diff --git a/debian/rules b/debian/rules
index d8c2967..97b4bac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,7 +100,7 @@ endif
 	            -docdir "/usr/share/qt5/doc" \
 	            -headerdir "/usr/include/qt5" \
 	            -datadir "/usr/share/qt5" \
-	            -archdatadir "/usr/share/qt5" \
+	            -archdatadir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5" \
 	            -hostdatadir "/usr/share/qt5" \
 	            -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins" \
 	            -importdir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/imports" \

-- 
qtbase packaging