[SCM] qtquickcontrols packaging branch, experimental, updated. debian/5.2.1-4-5-g5fdb6f0

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ccd109cb66231968e708d322b3591ffd0f21fc52
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun May 25 14:13:14 2014 +0400

    Add new qml-module-qtquick-dialogs package, moved here from qtdeclarative-opensource-src.
---
 debian/changelog                          |  2 ++
 debian/control                            | 17 +++++++++++++++++
 debian/qml-module-qtquick-dialogs.install |  1 +
 debian/qtquickcontrols5-doc-html.install  |  1 +
 debian/qtquickcontrols5-doc.install       |  1 +
 debian/rules                              |  2 +-
 6 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ad81b3d..8ef5df6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtquickcontrols-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies.
+  * Add new qml-module-qtquick-dialogs package, moved here from
+    qtdeclarative-opensource-src.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 25 May 2014 13:54:50 +0400
 
diff --git a/debian/control b/debian/control
index ee6853a..e967fae 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,19 @@ Description: Qt 5 Quick Controls QML module
  The Qt Quick Controls module provides a set of controls that can be used to
  build complete interfaces in Qt Quick.
 
+Package: qml-module-qtquick-dialogs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: qml-module-qtquick-privatewidgets, ${misc:Depends}, ${shlibs:Depends}
+Breaks: qtdeclarative5-dialogs-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-dialogs-plugin (<< 5.2.1-5~)
+Description: Qt 5 Dialogs QML module
+ 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 provides various dialogs that can be used in Qt Quick.
+
 Package: qtdeclarative5-quicklayouts-plugin
 Section: oldlibs
 Architecture: all
@@ -81,6 +94,8 @@ Priority: extra
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
+Breaks: qtdeclarative5-doc (<< 5.3.0)
+Replaces: qtdeclarative5-doc (<< 5.3.0)
 Description: Qt 5 Quick Controls documentation
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -93,6 +108,8 @@ Priority: extra
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
+Breaks: qtdeclarative5-doc-html (<< 5.3.0)
+Replaces: qtdeclarative5-doc-html (<< 5.3.0)
 Description: Qt 5 Quick Controls HTML documentation
  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/qml-module-qtquick-dialogs.install b/debian/qml-module-qtquick-dialogs.install
new file mode 100644
index 0000000..5ee9903
--- /dev/null
+++ b/debian/qml-module-qtquick-dialogs.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/qml/QtQuick/Dialogs/*
diff --git a/debian/qtquickcontrols5-doc-html.install b/debian/qtquickcontrols5-doc-html.install
index e893098..b4cd0d1 100644
--- a/debian/qtquickcontrols5-doc-html.install
+++ b/debian/qtquickcontrols5-doc-html.install
@@ -1,2 +1,3 @@
 usr/share/qt5/doc/qtquickcontrols
+usr/share/qt5/doc/qtquickdialogs
 usr/share/qt5/doc/qtquicklayouts
diff --git a/debian/qtquickcontrols5-doc.install b/debian/qtquickcontrols5-doc.install
index 1984c56..9606bc2 100644
--- a/debian/qtquickcontrols5-doc.install
+++ b/debian/qtquickcontrols5-doc.install
@@ -1,2 +1,3 @@
 usr/share/qt5/doc/qtquickcontrols.qch
+usr/share/qt5/doc/qtquickdialogs.qch
 usr/share/qt5/doc/qtquicklayouts.qch
diff --git a/debian/rules b/debian/rules
index 65b86df..ab3d9cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ export QT_SELECT := qt5
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf doc src/controls/controls.qrc
+	rm -rf doc src/controls/controls.qrc src/dialogs/dialogs.qrc
 
 override_dh_auto_configure:
 	qmake

-- 
qtquickcontrols packaging