[SCM] qtxmlpatterns packaging branch, experimental, updated. debian/5.2.1-2-2-gac0204d

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ac0204df7bd7ae6726d818c10982c5ff7b980c71
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Feb 12 11:05:30 2014 +0400

    Stop building qtxmlpatterns5-doc 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                  |  4 ++++
 debian/control                    | 12 ------------
 debian/qtxmlpatterns5-doc.install |  1 -
 debian/rules                      |  4 ++--
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7bd06e..bf6b52f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtxmlpatterns-opensource-src (5.2.1-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Stop building qtxmlpatterns5-doc 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>  Wed, 12 Feb 2014 10:59:33 +0400
 
diff --git a/debian/control b/debian/control
index 72cb7cf..45bbfdb 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,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/qtxmlpatterns.git
@@ -97,17 +96,6 @@ Description: Qt 5 XML patterns library debugging symbols
  This package contains the debugging symbols for the Qt 5 XML patterns
  libraries.
 
-Package: qtxmlpatterns5-doc
-Priority: extra
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Qt 5 XML patterns 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 XML patterns libraries.
-
 Package: qtxmlpatterns5-doc-html
 Priority: extra
 Architecture: all
diff --git a/debian/qtxmlpatterns5-doc.install b/debian/qtxmlpatterns5-doc.install
deleted file mode 100644
index 2dfef5a..0000000
--- a/debian/qtxmlpatterns5-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/qt5/doc/qtxmlpatterns.qch
diff --git a/debian/rules b/debian/rules
index 0580292..251e730 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,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
@@ -30,7 +30,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

-- 
qtxmlpatterns packaging