[SCM] qtmultimedia packaging branch, master, updated. debian/5.0.2-3-4-g5655d53

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 5655d5362beb88e68b4ce515982a0eaa01d83937
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Jun 9 13:05:12 2013 -0300

    Build and create packages for qch and HTML doc formats.
---
 debian/changelog                      |    1 +
 debian/control                        |   23 +++++++++++++++++++++++
 debian/qtmultimedia5-doc-html.install |    1 +
 debian/qtmultimedia5-doc.install      |    1 +
 debian/rules                          |    8 +++++++-
 5 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 73d3d51..ca6791b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtmultimedia-opensource-src (5.0.2-4) 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>  Sun, 09 Jun 2013 12:48:09 -0300
 
diff --git a/debian/control b/debian/control
index d0322bb..e3da15f 100644
--- a/debian/control
+++ b/debian/control
@@ -165,3 +165,26 @@ Description: Qt 5 Multimedia library debugging symbols
  .
  This package contains the debugging symbols for the Qt 5 Multimedia
  libraries.
+
+Package: qtmultimedia5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 multimedia 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 multimedia libraries.
+
+Package: qtmultimedia5-doc-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 multimedia 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 multimedia
+ libraries.
diff --git a/debian/qtmultimedia5-doc-html.install b/debian/qtmultimedia5-doc-html.install
new file mode 100644
index 0000000..d127529
--- /dev/null
+++ b/debian/qtmultimedia5-doc-html.install
@@ -0,0 +1 @@
+usr/share/qt5/doc/qtmultimedia/
diff --git a/debian/qtmultimedia5-doc.install b/debian/qtmultimedia5-doc.install
new file mode 100644
index 0000000..0e7162d
--- /dev/null
+++ b/debian/qtmultimedia5-doc.install
@@ -0,0 +1 @@
+usr/share/qt5/doc/qtmultimedia.qch
diff --git a/debian/rules b/debian/rules
index b28df56..933e65a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,10 @@ export QT_SELECT := qt5
 override_dh_auto_configure:
 	qmake
 
-override_dh_auto_install:
+override_dh_auto_build-indep:
+	dh_auto_build -Smakefile -- docs
+
+override_dh_auto_install-arch:
 	dh_auto_install
 	
 	# Fix wrong path in pkgconfig files
@@ -24,6 +27,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
 

-- 
qtmultimedia packaging