[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.3.2-4-10-g953641d

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 953641d58e9c52d4e005310e72205b9d1c67d353
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 16 18:50:51 2014 +0300

    Disable qml-module-qtqml-statemachine for now.
    
    We don't want it to get stuck in NEW queue, blocking other Qt work.
---
 debian/changelog |  2 ++
 debian/control   | 20 ++++++++++----------
 debian/rules     |  3 +++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b390b81..01d49a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ qtdeclarative-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   * Update debian/copyright.
   * Update Vcs-Browser field to point to cgit interface.
   * Bump Standards-Version to 3.9.6, no changes needed.
+  * Temporary disable building new qml-module-qtqml-statemachine package
+    to avoid blocking uploads of other Qt parts.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Dec 2014 07:06:24 +0000
 
diff --git a/debian/control b/debian/control
index 18b452b..6b72930 100644
--- a/debian/control
+++ b/debian/control
@@ -123,16 +123,16 @@ Description: Qt 5 Models2 QML module
  .
  The Models provides types previously found in Qt Quick module.
 
-Package: qml-module-qtqml-statemachine
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 State Machine 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.
- .
- The State Machine QML module.
+#Package: qml-module-qtqml-statemachine
+#Architecture: any
+#Multi-Arch: same
+#Pre-Depends: ${misc:Pre-Depends}
+#Depends: ${misc:Depends}, ${shlibs:Depends}
+#Description: Qt 5 State Machine 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.
+# .
+# The State Machine QML module.
 
 Package: qml-model-qtqml-models2
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 660f16b..392d606 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,9 @@ override_dh_auto_build-indep:
 override_dh_auto_install-arch:
 	dh_auto_install
 
+	# Disable StateMachine for now
+	sudo rm -rf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml/QtQml/StateMachine/
+
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
 	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;

-- 
qtdeclarative packaging