[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.4.0-2-6-g91dd39a

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 91dd39ac4250369540d3fbae1ec87f153dcec7d6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Dec 28 21:07:17 2014 +0300

    Revert "Disable qml-module-qtqml-statemachine for now."
    
    This reverts commit 953641d58e9c52d4e005310e72205b9d1c67d353.
---
 debian/changelog |  1 +
 debian/control   | 20 ++++++++++----------
 debian/rules     |  3 ---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 947afde..23c5585 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtdeclarative-opensource-src (5.4.0-4) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Update symbols files with buildds’ logs.
+  * Enable qml-module-qtqml-statemachine package.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Dec 2014 21:05:22 +0300
 
diff --git a/debian/control b/debian/control
index df2595d..cf70812 100644
--- a/debian/control
+++ b/debian/control
@@ -124,16 +124,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 f4cb39f..660f16b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,6 @@ override_dh_auto_build-indep:
 override_dh_auto_install-arch:
 	dh_auto_install
 
-	# Disable StateMachine for now
-	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