[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.2.1-2-2-g0ecf1ee

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 0ecf1ee9ee3060d90f0ab0ab1c6df4b854fc2429
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Feb 11 19:51:25 2014 +0400

    Stop building qtdeclarative5-doc-html from this source.
    
    It will be built from qttools-opensource-src instead.
    
    This allows us to drop qttools5-dev-tools build-dependency and
    get rid of dependency loop.
---
 debian/changelog                       |  5 +++++
 debian/control                         | 13 -------------
 debian/qtdeclarative5-doc-html.install |  3 ---
 debian/rules                           |  4 ++--
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4bace3f..84cd544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtdeclarative-opensource-src (5.2.1-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Stop building qtdeclarative5-doc-html from this source, it will be
+    built from qttools-opensource-src instead. This allows us to drop
+    qttools5-dev-tools build-dependency and get rid of dependency loop.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 10 Feb 2014 18:47:24 -0300
 
 qtdeclarative-opensource-src (5.2.1-2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 1f3ad46..04c7a42 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 9),
                pkg-kde-tools (>= 0.15.12~),
                python,
                qtbase5-private-dev (>= 5.2.1+dfsg~)
-Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.1~)
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtdeclarative.git
@@ -312,15 +311,3 @@ Description: Qt 5 declarative documentation
  is its rich set of widgets that provide standard GUI functionality.
  .
  This package contains the documentation for the Qt 5 declarative libraries.
-
-Package: qtdeclarative5-doc-html
-Priority: extra
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Qt 5 declarative 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.
- .
- This package contains the HTML documentation for the Qt 5 declarative
- libraries.
diff --git a/debian/qtdeclarative5-doc-html.install b/debian/qtdeclarative5-doc-html.install
deleted file mode 100644
index 9b3a2d2..0000000
--- a/debian/qtdeclarative5-doc-html.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/qt5/doc/qtqml/
-usr/share/qt5/doc/qtquick/
-usr/share/qt5/doc/qtquickdialogs/
diff --git a/debian/rules b/debian/rules
index 5e06bb0..ee1707a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_configure:
 	qmake
 
 override_dh_auto_build-indep:
-	dh_auto_build -Smakefile -- docs
+	dh_auto_build -Smakefile -- html_docs
 
 override_dh_auto_install-arch:
 	dh_auto_install
@@ -41,7 +41,7 @@ override_dh_auto_install-arch:
 	\) -print0 | xargs -0 chmod a-x
 
 override_dh_auto_install-indep:
-	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_html_docs
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qtdeclarative packaging