[SCM] qtbase packaging branch, master, updated. 3d00430489c05f595609ce66bc4f99b932dba7f0

[Fathi Boudra]

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

The following commit has been merged in the master branch:
commit 3d00430489c05f595609ce66bc4f99b932dba7f0
Author: Fathi Boudra <fathi.boudra at linaro.org>
Date:   Sun Jan 6 13:28:14 2013 +0200

    Re-order qt5-default package in control and remove shlibs:Depends
---
 debian/control             |   26 +++++++++++++-------------
 debian/qt5-default.install |    2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 7509c83..211eec1 100644
--- a/debian/control
+++ b/debian/control
@@ -55,19 +55,6 @@ Homepage: http://qt-project.org/
 Vcs-Git: git://git.debian.org/pkg-kde/qt/qtbase.git
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=summary
 
-Package: qt5-default
-Architecture: all
-Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: qt4-default
-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.
- .
- This package sets Qt 5 to be the default Qt version to be used when
- using development binaries like qmake. It provides a default
- configuration for qtchooser, but does not prevent alternative Qt
- installations from being used.
-
 Package: libqt5core5
 Architecture: any
 Multi-Arch: same
@@ -417,3 +404,16 @@ Description: Qt 5 base examples debugging symbols
  is its rich set of widgets that provide standard GUI functionality.
  .
  This package contains the debugging symbols for the Qt 5 examples.
+
+Package: qt5-default
+Architecture: all
+Depends: qtchooser, ${misc:Depends}
+Conflicts: qt4-default
+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.
+ .
+ This package sets Qt 5 to be the default Qt version to be used when
+ using development binaries like qmake. It provides a default
+ configuration for qtchooser, but does not prevent alternative Qt
+ installations from being used.
diff --git a/debian/qt5-default.install b/debian/qt5-default.install
index 485b34e..11db59d 100644
--- a/debian/qt5-default.install
+++ b/debian/qt5-default.install
@@ -1,2 +1,2 @@
 
-/etc/xdg/qtchooser/default.conf
+etc/xdg/qtchooser/default.conf

-- 
qtbase packaging