[SCM] qtconnectivity packaging branch, experimental, updated. debian/5.4.1-1-3-g0d11944

Dmitry Shachnev mitya57 at moszumanska.debian.org
Thu Mar 5 17:08:59 UTC 2015


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

The following commit has been merged in the experimental branch:
commit 98f2d27eb5b6b466788c001842983a21d4eff35e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Mar 5 19:59:08 2015 +0300

    Add documentation packages.
---
 debian/changelog                        |  2 ++
 debian/control                          | 27 +++++++++++++++++++++++++++
 debian/qtconnectivity5-doc-html.install |  2 ++
 debian/qtconnectivity5-doc.install      |  2 ++
 debian/rules                            |  8 +++++++-
 5 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5e1a7a7..9dad14d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtconnectivity-opensource-src (5.4.1-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Add documentation packages.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 05 Mar 2015 19:58:03 +0300
 
diff --git a/debian/control b/debian/control
index 30537f4..b637197 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,9 @@ Build-Depends: debhelper (>= 9.0.0),
                pkg-kde-tools,
                qtbase5-dev (>= 5.4.1+dfsg~),
                qtdeclarative5-private-dev (>= 5.4.1~)
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.4.1+dfsg~),
+                     qtbase5-doc-html (>= 5.4.1+dfsg~),
+                     qttools5-dev-tools (>= 5.4.1~)
 Standards-Version: 3.9.6
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtconnectivity.git
@@ -118,3 +121,27 @@ Description: Qt Connectivity library debugging symbols
  .
  This package contains the debugging symbols for the Qt 5 Connectivity
  libraries.
+
+Package: qtconnectivity5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 Sensors 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 Connectivity
+ modules (Qt Bluetooth and Qt NFC).
+
+Package: qtconnectivity5-doc-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 Sensors 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 Connectivity
+ modules (Qt Bluetooth and Qt NFC).
diff --git a/debian/qtconnectivity5-doc-html.install b/debian/qtconnectivity5-doc-html.install
new file mode 100644
index 0000000..73c2774
--- /dev/null
+++ b/debian/qtconnectivity5-doc-html.install
@@ -0,0 +1,2 @@
+usr/share/qt5/doc/qtbluetooth
+usr/share/qt5/doc/qtnfc
diff --git a/debian/qtconnectivity5-doc.install b/debian/qtconnectivity5-doc.install
new file mode 100644
index 0000000..77e58f2
--- /dev/null
+++ b/debian/qtconnectivity5-doc.install
@@ -0,0 +1,2 @@
+usr/share/qt5/doc/qtbluetooth.qch
+usr/share/qt5/doc/qtnfc.qch
diff --git a/debian/rules b/debian/rules
index 0c42b26..3163791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,10 @@ override_dh_auto_configure:
 	# Now call qmake
 	qmake
 
-override_dh_auto_install:
+override_dh_auto_build-indep:
+	dh_auto_build -Smakefile -- docs
+
+override_dh_auto_install-arch:
 	dh_auto_install
 
 	# Remove libtool-like files
@@ -27,3 +30,6 @@ override_dh_auto_install:
 	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtNfc/*/QtNfc/private/
 	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtBluetooth/*/QtBluetooth/private/
 	find debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/ -type d -empty -delete
+
+override_dh_auto_install-indep:
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs

-- 
qtconnectivity packaging



More information about the pkg-kde-commits mailing list