[SCM] qtscript packaging branch, experimental, updated. debian/5.2.1+dfsg-2-3-g5f6be4e

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 5f6be4e8b75d22f5e884e62631c3b8400182b942
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat May 17 23:48:23 2014 -0300

    Do not build qtscript5-doc anymore from this source.
---
 debian/changelog |  3 +++
 debian/control   | 12 ------------
 debian/rules     |  4 ++--
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2f70a6..42cd1e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtscript-opensource-src (5.2.1+dfsg-3) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add missing word in qtscript5-private-dev's description (Closes: #745300).
     Thanks Pascal De Vuyst.
+  * Do not build qtscript5-doc anymore from this source, thus allowing us to
+    avoid a dependency on qttools and a circular dependency.
+    The package will be built from qttools itself.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 20 Apr 2014 22:27:08 -0300
 
diff --git a/debian/control b/debian/control
index 707a22a..fd42e12 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 9),
                qtbase5-private-dev (>= 5.2.1+dfsg~),
                xauth,
                xvfb
-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/qtscript.git
@@ -103,17 +102,6 @@ Description: Qt 5 script libraries debugging symbols
  .
  This package contains the debugging symbols for the Qt 5 script libraries.
 
-Package: qtscript5-doc
-Priority: extra
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Qt 5 script 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 documentation for the Qt 5 script libraries.
-
 Package: qtscript5-doc-html
 Priority: extra
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 86f1644..b28565c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_auto_configure:
 	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
-	 dh_auto_build -Smakefile -- docs
+	 dh_auto_build -Smakefile -- html_docs
 
 override_dh_auto_install-arch:
 	dh_auto_install
@@ -25,7 +25,7 @@ override_dh_auto_install-arch:
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 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

-- 
qtscript packaging