[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.2.0-4-3-ge55943f

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit e55943fe2e0d12be17d3492f93300d8cc77b47be
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Dec 20 09:30:59 2013 +0400

    Separate the qml binary into own package, likely to be used alone.
    
    Taken from kubuntu-packaging bzr branch.
---
 debian/changelog                        |  5 ++++-
 debian/control                          | 16 +++++++++++++++-
 debian/qml.install                      |  1 +
 debian/qtdeclarative5-dev-tools.install |  1 -
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c17c16..e5924c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 qtdeclarative-opensource-src (5.2.0-5) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
-  * Do not hardcode the version number in debian/qtdeclarative5-private-dev.install.
+  * Do not hardcode the version number in qtdeclarative5-private-dev.install.
+
+  [ Timo Jyrinki ]
+  * Separate the qml binary into own package, likely to be used alone.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Dec 2013 21:49:05 +0400
 
diff --git a/debian/control b/debian/control
index dc88952..fb7c937 100644
--- a/debian/control
+++ b/debian/control
@@ -248,7 +248,21 @@ Description: Qt 5 QML scene viewer
  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 contains the QML viewer for Qt Quick 2.
+ This package contains the older QML viewer for Qt Quick 2. See qml package
+ for the newer one.
+
+Package: qml
+Architecture: any
+Multi-Arch: foreign
+Section: devel
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 QML viewer
+ 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 contains the new QML viewer for Qt Quick 2, called simply
+ 'qml'.
 
 Package: qtdeclarative5-examples
 Architecture: any
diff --git a/debian/qml.install b/debian/qml.install
new file mode 100644
index 0000000..f8b4aa5
--- /dev/null
+++ b/debian/qml.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/bin/qml
diff --git a/debian/qtdeclarative5-dev-tools.install b/debian/qtdeclarative5-dev-tools.install
index cf7cae2..566d7c3 100644
--- a/debian/qtdeclarative5-dev-tools.install
+++ b/debian/qtdeclarative5-dev-tools.install
@@ -1,4 +1,3 @@
-usr/lib/*/qt5/bin/qml
 usr/lib/*/qt5/bin/qmlbundle
 usr/lib/*/qt5/bin/qmlimportscanner
 usr/lib/*/qt5/bin/qmlmin

-- 
qtdeclarative packaging