[SCM] qbs packaging branch, master, updated. debian/1.7.0+dfsg-4-12-g0050de0

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 5a3595fe8e80a71e85dd17bd76b240b9c3ad3452
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jun 6 14:51:45 2017 +0300

    Update docs installation code for the new release.
---
 debian/changelog            | 1 +
 debian/qbs-doc-html.install | 2 +-
 debian/qbs-doc.install      | 2 +-
 debian/rules                | 5 +----
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 597d2fa..5c520fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qbs (1.8.0+dfsg-1) UNRELEASED; urgency=medium
   * Bump qtbase5-dev build-dependency to 5.6.0, following upstream.
   * Improve package descriptions, thanks Joerg Bornemann (closes: #863874).
   * Update debian/copyright.
+  * Update docs installation code for the new release.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 06 Jun 2017 13:58:02 +0300
 
diff --git a/debian/qbs-doc-html.install b/debian/qbs-doc-html.install
index 8597f8d..fd851d7 100644
--- a/debian/qbs-doc-html.install
+++ b/debian/qbs-doc-html.install
@@ -1 +1 @@
-usr/share/qt5/doc/qbs/
+usr/share/doc/qbs/html/
diff --git a/debian/qbs-doc.install b/debian/qbs-doc.install
index 1e1b846..90c1611 100644
--- a/debian/qbs-doc.install
+++ b/debian/qbs-doc.install
@@ -1 +1 @@
-usr/share/qt5/doc/qbs.qch
+doc/qbs.qch usr/share/qt5/doc/
diff --git a/debian/rules b/debian/rules
index b836f5f..9869a44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,6 @@ export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags -
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
-QT_INSTALL_DOCS := $(shell qmake -query QT_INSTALL_DOCS)
 
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper
@@ -31,16 +30,14 @@ override_dh_auto_configure:
 		QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
 		QMAKE_LFLAGS+="${LDFLAGS}" \
 		QBS_INSTALL_PREFIX=/usr \
-		QBS_DOCS_INSTALL_DIR=${QT_INSTALL_DOCS} \
 		QBS_LIBRARY_DIRNAME=lib/${DEB_HOST_MULTIARCH}
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 
 override_dh_auto_install-indep:
-	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_inst_html_docs
 	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp sub-static-pro-install_subtargets
-	cd debian/tmp${QT_INSTALL_DOCS} && mv html qbs
 
 override_dh_auto_test-arch:
 	set -ex; \

-- 
qbs packaging