[SCM] qbs packaging branch, master, updated. debian/1.7.0+dfsg-4-8-gb406a7f
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Tue Jun 6 11:03:20 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=456ae50
The following commit has been merged in the master branch:
commit 456ae50db56cf743602383c408513241cbe1a646
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Tue Jun 6 13:59:44 2017 +0300
Update patches for 1.8.0.
---
debian/changelog | 2 +
debian/patches/kfreebsd_soname.diff | 2 +-
debian/patches/qmake_documentation.diff | 135 -------------------------------
debian/patches/series | 1 -
debian/patches/skip_test_concurrent.diff | 2 +-
5 files changed, 4 insertions(+), 138 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7b67d6e..90b4e8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
qbs (1.8.0+dfsg-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop qmake_documentation.diff, applied upstream.
+ * Refresh kfreebsd_soname.diff and skip_test_concurrent.diff.
-- Dmitry Shachnev <mitya57 at debian.org> Tue, 06 Jun 2017 13:58:02 +0300
diff --git a/debian/patches/kfreebsd_soname.diff b/debian/patches/kfreebsd_soname.diff
index bad6d12..234515f 100644
--- a/debian/patches/kfreebsd_soname.diff
+++ b/debian/patches/kfreebsd_soname.diff
@@ -5,7 +5,7 @@ Last-Update: 2017-01-04
--- a/src/lib/library.pri
+++ b/src/lib/library.pri
-@@ -26,7 +26,7 @@
+@@ -28,7 +28,7 @@
include(../../qbs_version.pri)
VERSION = $${QBS_VERSION}
diff --git a/debian/patches/qmake_documentation.diff b/debian/patches/qmake_documentation.diff
deleted file mode 100644
index 55a6618..0000000
--- a/debian/patches/qmake_documentation.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-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 3c5aa07..585e8ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ disable_tests_qtscript.diff
skip_test_concurrent.diff
fix_ftbfs_gcc6.diff
kfreebsd_soname.diff
-qmake_documentation.diff
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index c016d87..ff06922 100644
--- a/debian/patches/skip_test_concurrent.diff
+++ b/debian/patches/skip_test_concurrent.diff
@@ -5,7 +5,7 @@ Last-Update: 2016-03-20
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
-@@ -1029,6 +1029,7 @@
+@@ -1177,6 +1177,7 @@
void TestBlackbox::concurrentExecutor()
{
--
qbs packaging
More information about the pkg-kde-commits
mailing list