[SCM] qtlocation packaging branch, master, updated. 2b6e965e6149077a853b4a908fa7b8257ab56b30

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit fe429a8ad3751d6105be6a58d4b3bfe6282c4c3e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Feb 26 20:16:41 2014 -0300

    Create and install doc packages.
---
 debian/control | 26 ++++++++++++++++++++++++++
 debian/rules   | 14 +++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 853c23c..e5a5755 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Build-Depends: debhelper (>= 9.0.0),
                qtdeclarative5-private-dev (>= 5.2.1~),
                qtdeclarative5-qtquick2-plugin (>= 5.2.1~),
                xvfb
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.2.1+dfsg~),
+                     qttools5-dev-tools (>= 5.2.1~)
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtlocation.git
@@ -95,3 +97,27 @@ Description: Qt Location library debugging symbols
  .
  This package contains the debugging symbols for the Qt 5 Location
  and Positioning libraries.
+
+Package: qtpositioning5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 Positioning 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 Positioning
+ library and binaries.
+
+Package: qtpositioning5-doc-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 Positioning 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 Positioning
+ libraries and binaries.
diff --git a/debian/rules b/debian/rules
index 16373fb..05e6150 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,16 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	qmake QT_BUILD_PARTS+=tests
 
-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 hesitate to tell us.
+	dh_auto_build
+
+override_dh_auto_build-indep:
+	dh_auto_build -Smakefile -- docs
+
+override_dh_auto_install-arch:
 	dh_auto_install
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
@@ -48,6 +57,9 @@ override_dh_auto_install:
 	# Remove binary that includes libtheora in itself
 	rm -f debian/tmp/usr/lib/*/qt5/examples/qtlocation/declarative/mapviewer/qml_location_mapviewer
 
+override_dh_auto_install-indep:
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+
 override_dh_install:
 	dh_install --fail-missing
 

-- 
qtlocation packaging