[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.1+dfsg-5-10-g2c3a6cc

[Lisandro Damián Nicanor Pérez]

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

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

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

diff --git a/debian/changelog b/debian/changelog
index 4fdcc9a..78486d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 qtwebkit-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
+  * Do not build qtwebkit5-doc from this source anymore. It will now be built
+    from qttools. In this way we allow qttools to build depend upon
+    libqt5webkit5-dev without creating a circular dependency.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 May 2014 23:25:31 -0300
 
diff --git a/debian/control b/debian/control
index 9f5335c..b42118a 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,6 @@ Build-Depends: bison,
                qtdeclarative5-private-dev (>= 5.2.1~),
                qtscript5-private-dev (>= 5.2.1~),
                ruby
-Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.1~)
 Standards-Version: 3.9.5
 Section: libs
 Homepage: http://trac.webkit.org/wiki/QtWebKit
@@ -104,17 +103,6 @@ Description: Web content engine library for Qt - debugging symbols
  .
  This package contains the debugging symbols for the Qt WebKit library.
 
-Package: qtwebkit5-doc
-Priority: extra
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Qt 5 webkit 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 webkit libraries.
-
 Package: qtwebkit5-doc-html
 Priority: extra
 Architecture: all
diff --git a/debian/rules b/debian/rules
index d9578a0..f90dec5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ override_dh_auto_build-arch:
 	dh_auto_build
 
 override_dh_auto_build-indep:
-	dh_auto_build -Smakefile -- docs
+	dh_auto_build -Smakefile -- html_docs
 
 override_dh_auto_install-arch:
 	make install INSTALL_ROOT=$(CURDIR)/debian/tmp
@@ -75,7 +75,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

-- 
qt5webkit packaging