[SCM] qbs packaging branch, master, updated. debian/1.7.0+dfsg-3-1-g9299aa2
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Wed Jan 25 09:04:54 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=9299aa2
The following commit has been merged in the master branch:
commit 9299aa2a40dda3bc5aae25f8dd87e4c2f4e78eee
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed Jan 25 12:04:11 2017 +0300
Install the qch docs into the correct location.
Closes: #795829.
---
debian/changelog | 8 ++
debian/patches/qmake_documentation.diff | 135 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/qbs-doc-html.install | 2 +-
debian/qbs-doc.install | 2 +-
debian/rules | 3 +
6 files changed, 149 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c181160..1273f8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qbs (1.7.0+dfsg-4) UNRELEASED; urgency=medium
+
+ * Backport upstream patch to make documentation install dir configurable
+ (qmake_documentation.diff).
+ * Install the documentation into correct location (closes: #795829).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 25 Jan 2017 12:01:02 +0300
+
qbs (1.7.0+dfsg-3) unstable; urgency=medium
* Fix the arch:all build by passing -f to rm command.
diff --git a/debian/patches/qmake_documentation.diff b/debian/patches/qmake_documentation.diff
new file mode 100644
index 0000000..55a6618
--- /dev/null
+++ b/debian/patches/qmake_documentation.diff
@@ -0,0 +1,135 @@
+Description: make the documentation includable by other projects
+ Other projects (e.g. Qt Creator) can now build and install the qbs
+ documentation by including doc_targets.pri and setting the variables
+ QBS_DOCS_INSTALL_DIR and QBS_DOCS_BUILD_DIR.
+ .
+ By overriding QBS_DOCS_INSTALL_DIR users can also specify an alternative
+ documentation installation location for qbs itself.
+Origin: upstream, https://code.qt.io/cgit/qt-labs/qbs.git/commit/?id=3f76c27847c157a0
+Last-Update: 2017-01-25
+
+--- a/doc/doc.pri
++++ b/doc/doc.pri
+@@ -8,56 +8,21 @@
+ QDOC_MAINFILE = $$PWD/qbs.qdocconf
+ HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator)
+
+-VERSION_TAG = $$replace(QBS_VERSION, "[-.]", )
++include(doc_targets.pri)
+
+-HTML_DOC_PATH=$$OUT_PWD/doc/html
+-equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys
+- QDOC = SRCDIR=$$PWD OUTDIR=$$HTML_DOC_PATH QBS_VERSION=$$QBS_VERSION QBS_VERSION_TAG=$$VERSION_TAG QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS] $$QDOC_BIN
+-} else:win32-g++* { # just mingw
+- # The lack of spaces in front of the && is necessary!
+- QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$HTML_DOC_PATH&& set QBS_VERSION=$$QBS_VERSION&& set QBS_VERSION_TAG=$$VERSION_TAG&& set QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]&& $$QDOC_BIN
+-} else { # nmake
+- QDOC = set SRCDIR=$$PWD $$escape_expand(\n\t) \
+- set OUTDIR=$$HTML_DOC_PATH $$escape_expand(\n\t) \
+- set QBS_VERSION=$$QBS_VERSION $$escape_expand(\n\t) \
+- set QBS_VERSION_TAG=$$VERSION_TAG $$escape_expand(\n\t) \
+- set QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS] $$escape_expand(\n\t) \
+- $$QDOC_BIN
+-}
+-
+-QHP_FILE = $$HTML_DOC_PATH/qbs.qhp
+-QCH_FILE = $$OUT_PWD/doc/qbs.qch
+-
+-HELP_DEP_FILES = $$PWD/qbs.qdoc \
+- $$QDOC_MAINFILE
+-
+-html_docs.commands = $$QDOC $$PWD/qbs.qdocconf
+-html_docs.depends += $$HELP_DEP_FILES
+-
+-html_docs_online.commands = $$QDOC $$PWD/qbs-online.qdocconf
+-html_docs_online.files = $$QHP_FILE
+-
+-qch_docs.commands = $$HELPGENERATOR -o $$shell_quote($$QCH_FILE) $$QHP_FILE
+-qch_docs.depends += html_docs
+-
+-docs_online.depends = html_docs_online
+-QMAKE_EXTRA_TARGETS += html_docs_online docs_online
+-
+-inst_qch_docs.files = $$QCH_FILE
+-inst_qch_docs.path = $${QBS_INSTALL_PREFIX}/share/doc/qbs
+-inst_qch_docs.CONFIG += no_check_exist no_default_install
+-INSTALLS += inst_qch_docs
+-
+-inst_html_docs.files = $$HTML_DOC_PATH
+-inst_html_docs.path = $$inst_qch_docs.path
+-inst_html_docs.CONFIG += no_check_exist no_default_install directory
+-INSTALLS += inst_html_docs
+-
+-install_docs.depends = install_inst_qch_docs install_inst_html_docs
+-QMAKE_EXTRA_TARGETS += install_docs
+-
+-docs.depends = qch_docs
+-QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
++html_docs.depends = qbs_html_docs
++html_docs_online.depends = qbs_html_docs_online
++qch_docs.depends = qbs_qch_docs
++docs_online.depends = qbs_docs_online
++install_docs.depends = qbs_install_docs
++docs.depends = qbs_docs
++QMAKE_EXTRA_TARGETS += \
++ docs \
++ docs_online \
++ html_docs \
++ html_docs_online \
++ install_docs \
++ qch_docs
+
+ fixnavi.commands = \
+ cd $$targetPath($$PWD) && \
+--- /dev/null
++++ b/doc/doc_targets.pri
+@@ -0,0 +1,49 @@
++# This pri file can be included by other projects that want to provide the qbs documentation.
++# Common variables like QDOC_BIN or HELPGENERATOR must be provided by the including file.
++QBS_VERSION_TAG = $$replace(QBS_VERSION, "[-.]", )
++
++isEmpty(QBS_DOCS_BUILD_DIR): QBS_DOCS_BUILD_DIR = $$OUT_PWD/doc
++isEmpty(QBS_HTML_DOC_PATH): QBS_HTML_DOC_PATH = $$QBS_DOCS_BUILD_DIR/html
++equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys
++ QDOC = SRCDIR=$$PWD OUTDIR=$$QBS_HTML_DOC_PATH QBS_VERSION=$$QBS_VERSION QBS_VERSION_TAG=$$QBS_VERSION_TAG QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS] $$QDOC_BIN
++} else: mingw {
++ # The lack of spaces in front of the && is necessary!
++ QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$QBS_HTML_DOC_PATH&& set QBS_VERSION=$$QBS_VERSION&& set QBS_VERSION_TAG=$$QBS_VERSION_TAG&& set QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]&& $$QDOC_BIN
++} else { # nmake
++ QDOC = set SRCDIR=$$PWD $$escape_expand(\n\t) \
++ set OUTDIR=$$QBS_HTML_DOC_PATH $$escape_expand(\n\t) \
++ set QBS_VERSION=$$QBS_VERSION $$escape_expand(\n\t) \
++ set QBS_VERSION_TAG=$$QBS_VERSION_TAG $$escape_expand(\n\t) \
++ set QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS] $$escape_expand(\n\t) \
++ $$QDOC_BIN
++}
++
++QBS_QHP_FILE = $$QBS_HTML_DOC_PATH/qbs.qhp
++QBS_QCH_FILE = $$QBS_DOCS_BUILD_DIR/qbs.qch
++
++QBS_HELP_DEP_FILES = \
++ $$PWD/qbs.qdoc \
++ $$PWD/qbs.qdocconf
++
++qbs_html_docs.commands = $$QDOC $$PWD/qbs.qdocconf
++qbs_html_docs.depends += $$QBS_HELP_DEP_FILES
++
++qbs_qch_docs.commands = $$HELPGENERATOR -o $$shell_quote($$QBS_QCH_FILE) $$QBS_QHP_FILE
++qbs_qch_docs.depends += qbs_html_docs
++
++isEmpty(QBS_DOCS_INSTALL_DIR): QBS_DOCS_INSTALL_DIR = $${QBS_INSTALL_PREFIX}/share/doc/qbs
++inst_qbs_qch_docs.files = $$QBS_QCH_FILE
++inst_qbs_qch_docs.path = $$QBS_DOCS_INSTALL_DIR
++inst_qbs_qch_docs.CONFIG += no_check_exist no_default_install
++INSTALLS += inst_qbs_qch_docs
++
++inst_qbs_html_docs.files = $$QBS_HTML_DOC_PATH
++inst_qbs_html_docs.path = $$inst_qbs_qch_docs.path
++inst_qbs_html_docs.CONFIG += no_check_exist no_default_install directory
++INSTALLS += inst_qbs_html_docs
++
++qbs_install_docs.depends = install_inst_qbs_qch_docs install_inst_qbs_html_docs
++QMAKE_EXTRA_TARGETS += qbs_install_docs
++
++qbs_docs.depends = qbs_qch_docs
++QMAKE_EXTRA_TARGETS += qbs_html_docs qbs_qch_docs qbs_docs
diff --git a/debian/patches/series b/debian/patches/series
index 6ccd4ff..97c365a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ skip_test_concurrent.diff
fix_ftbfs_gcc6.diff
fix_race_condition.diff
kfreebsd_soname.diff
+qmake_documentation.diff
diff --git a/debian/qbs-doc-html.install b/debian/qbs-doc-html.install
index fd851d7..8597f8d 100644
--- a/debian/qbs-doc-html.install
+++ b/debian/qbs-doc-html.install
@@ -1 +1 @@
-usr/share/doc/qbs/html/
+usr/share/qt5/doc/qbs/
diff --git a/debian/qbs-doc.install b/debian/qbs-doc.install
index 6496ea4..1e1b846 100644
--- a/debian/qbs-doc.install
+++ b/debian/qbs-doc.install
@@ -1 +1 @@
-usr/share/doc/qbs/qbs.qch
+usr/share/qt5/doc/qbs.qch
diff --git a/debian/rules b/debian/rules
index 63e5c20..b836f5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ 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
@@ -30,6 +31,7 @@ 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:
@@ -38,6 +40,7 @@ override_dh_auto_build-indep:
override_dh_auto_install-indep:
dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_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
More information about the pkg-kde-commits
mailing list