[SCM] qtbase packaging branch, master, updated. debian/5.0.0-1-15-gb14c61a

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit b14c61ab8f7c3b1009cb174d08da1172d4dd7ae2
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Feb 7 14:02:33 2013 +0000

    Move qt5.conf back to qtbase5-dev to prevent multi-arch issues.
    
    Non-developers who want to use eg. standalone qmlscene need to use the
    "deep path".
---
 debian/libqt5core5.install |    1 -
 debian/qtbase5-dev.install |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/libqt5core5.install b/debian/libqt5core5.install
index 4358b7f..9e7ea9b 100644
--- a/debian/libqt5core5.install
+++ b/debian/libqt5core5.install
@@ -1,2 +1 @@
 usr/lib/*/libQt5Core.so.*
-usr/share/qtchooser/qt5.conf
diff --git a/debian/qtbase5-dev.install b/debian/qtbase5-dev.install
index 97df12c..d408d65 100644
--- a/debian/qtbase5-dev.install
+++ b/debian/qtbase5-dev.install
@@ -1,3 +1,4 @@
+usr/share/qtchooser/qt5.conf
 usr/include/qt5/QtConcurrent/QtConcurrent
 usr/include/qt5/QtConcurrent/QtConcurrentFilter
 usr/include/qt5/QtConcurrent/QtConcurrentMap

-- 
qtbase packaging