[SCM] qt5webkit packaging branch, master, updated. debian/5.0.2-1-10-gb71abdc

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit b71abdccd95b9d2fbf2014e9ae00bde24cbe5d2d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Jun 16 18:21:16 2013 -0300

    Build and create packages for qch and HTML doc formats.
---
 debian/changelog |    1 +
 debian/control   |   23 +++++++++++++++++++++++
 debian/rules     |   14 +++++++++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c9a8f0c..53c2e08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtwebkit-opensource-src (5.0.2-2) UNRELEASED; urgency=low
     - Add the necessary indep build dependencies:
       * qttools5-dev-tools to use qhelpgenerator.
       * libqt5sql5-sqlite to generate qch doc.
+    - Build and create packages for qch and HTML doc formats.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 03 Jun 2013 10:40:04 +0300
 
diff --git a/debian/control b/debian/control
index 838dc50..5626780 100644
--- a/debian/control
+++ b/debian/control
@@ -90,3 +90,26 @@ Description: Web content engine library for Qt - debugging symbols
  from the World Wide Web into your Qt application.
  .
  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
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 webkit 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 webkit
+ libraries.
diff --git a/debian/rules b/debian/rules
index 793165b..96e461b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,16 @@ endif
 override_dh_auto_configure:
 	qmake
 
-override_dh_auto_install:
+override_dh_auto_build-arch:
+	# This override may seem futile, but it helps us make sure that the tools
+	# needed for building the docs are built before calling them.
+	# If there's a better way, do not heasitate to tell us.
+	dh_auto_build
+
+override_dh_auto_build-indep:
+	dh_auto_build -Smakefile -- docs
+
+override_dh_auto_install-arch:
 	make install INSTALL_ROOT=$(CURDIR)/debian/tmp
 	
 	# Remove rpath from the offending binaries
@@ -46,6 +55,9 @@ override_dh_auto_install:
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
+override_dh_auto_install-indep:
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+
 override_dh_install:
 	dh_install --fail-missing
 

-- 
qt5webkit packaging