[SCM] qtbase packaging branch, master, updated. debian/5.0.0-1-13-g0955571

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 09555719a7697076519582a7846e7f42ea49046e
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Jan 25 05:45:20 2013 +0000

    Move qt5.conf because of the way qtchooser usage is spread.
    
    Move qt5.conf from qtbase5-dev to libqt5core5. The rationale is that
    there are development executables handled by qtchooser that do not
    require any other development packages to be installed, like qmlscene
    from qtdeclarative. Meanwhile, qt5-default should not depend but just
    suggest qtbase5-dev in case one wants to eg. just use such an
    executable via qtchooser but not install additional packages.
---
 debian/control             |    4 ++--
 debian/libqt5core5.install |    1 +
 debian/qtbase5-dev.install |    1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 1e3571e..d03ba94 100644
--- a/debian/control
+++ b/debian/control
@@ -407,9 +407,9 @@ Description: Qt 5 base examples debugging symbols
 
 Package: qt5-default
 Architecture: all
-Depends: qtchooser, qtbase5-dev, ${misc:Depends}
+Depends: qtchooser, ${misc:Depends}
 Conflicts: qt4-default
-Suggests: qt5-qmake, qtbase5-dev-tools
+Suggests: qtbase5-dev, qt5-qmake, qtbase5-dev-tools
 Description: Qt 5 development defaults package
  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/libqt5core5.install b/debian/libqt5core5.install
index 9e7ea9b..4358b7f 100644
--- a/debian/libqt5core5.install
+++ b/debian/libqt5core5.install
@@ -1 +1,2 @@
 usr/lib/*/libQt5Core.so.*
+usr/share/qtchooser/qt5.conf
diff --git a/debian/qtbase5-dev.install b/debian/qtbase5-dev.install
index a79ca22..d6d10e9 100644
--- a/debian/qtbase5-dev.install
+++ b/debian/qtbase5-dev.install
@@ -1,4 +1,3 @@
-usr/share/qtchooser/qt5.conf
 usr/include/qt5/QtConcurrent/QtConcurrent
 usr/include/qt5/QtConcurrent/QtConcurrentFilter
 usr/include/qt5/QtConcurrent/QtConcurrentMap

-- 
qtbase packaging