[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.1+dfsg-3-266-g88af00f

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=88af00f

The following commit has been merged in the ubuntu+1 branch:
commit 88af00f706f8c881169f2929292e99a62bb9108a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jul 5 12:34:26 2017 +0300

    Drop revert-automatic-code-attribution-docs.patch.
    
    It is no longer needed since we bootstrapped qttools.
---
 debian/changelog                                   |  3 -
 .../revert-automatic-code-attribution-docs.patch   | 68 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 72 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5138a4..d90e33a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,9 +32,6 @@ qtbase-opensource-src (5.9.1+dfsg-3ubuntu1) UNRELEASED; urgency=medium
     series file:
     - xcb-Fix-drag-and-drop-to-Emacs.patch
     - xcb-Fix-drag-and-drop-to-applications-like-Emacs-and.patch
-  * Add revert-automatic-code-attribution-docs.patch which reverts a
-    commit from upstream because it requires a tool introduced in a Qt
-    Tools version (5.8) that Ubuntu skipped.
   * Add arm64 to the arches GLES is built on in qtbase5-private-
     dev.install.
   * Simplify disabling of gold linker in debian/rules.
diff --git a/debian/patches/revert-automatic-code-attribution-docs.patch b/debian/patches/revert-automatic-code-attribution-docs.patch
deleted file mode 100644
index d72c091..0000000
--- a/debian/patches/revert-automatic-code-attribution-docs.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit 6c68df6c30572cebdcc1a0db7e40170a3ccbcc54
-Author: Simon Quigley <tsimonq2 at ubuntu.com>
-Date:   Sun Jun 11 19:23:37 2017 -0500
-
-    Revert "Automatically generate code attribution documentation"
-    
-    This commit needed to be reverted in order to build qtbase because the
-    automatic generation tool it uses in this commit is only available in Qt
-    Tools 5.8 and over, which Ubuntu does not have.
-    
-    This patch can be removed once Qt Tools 5.9.0 has landed in Ubuntu Artful.
-
-diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf
-index 0c22d70529..9838ce3d89 100644
---- a/doc/global/config.qdocconf
-+++ b/doc/global/config.qdocconf
-@@ -10,6 +10,6 @@ dita.metadata.default.audience = programmer
- #Set the main Qt index.html
- navigation.homepage = "Qt $QT_VER"
- 
--sourcedirs += includes $$BUILDDIR
-+sourcedirs += includes
- 
- url = http://doc.qt.io/qt-5
-diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
-index 72dde61a40..183d0c9502 100644
---- a/mkspecs/features/qt_docs.prf
-+++ b/mkspecs/features/qt_docs.prf
-@@ -21,16 +21,12 @@ qtvertag.name = QT_VERSION_TAG
- qtvertag.value = $$replace(qtver.value, \.,)
- qtdocs.name = QT_INSTALL_DOCS
- qtdocs.value = $$[QT_INSTALL_DOCS/src]
--builddir.name = BUILDDIR
--builddir.value = $$OUT_PWD
--QT_TOOL_ENV = qtver qtmver qtvertag qtdocs builddir
-+QT_TOOL_ENV = qtver qtmver qtvertag qtdocs
- qtPrepareTool(QDOC, qdoc)
- QT_TOOL_ENV =
- 
- !build_online_docs: qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
- 
--qtPrepareTool(QTATTRIBUTIONSSCANNER, qtattributionsscanner)
--
- # qtPrepareTool() must be called outside a build pass, as it protects
- # against concurrent wrapper creation by omitting it during build passes.
- # However, creating the actual targets is reserved to the build passes.
-@@ -67,21 +63,12 @@ DOC_INDEXES =
-         PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])
-     DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])
- }
--
--qtattributionsscanner.target = qtattributionsscanner
--qtattributionsscanner.commands = $$QTATTRIBUTIONSSCANNER $$shell_quote($$MODULE_BASE_INDIR) \
--    --filter "QDocModule=$$QMAKE_DOCS_TARGET" -o $$shell_quote($$OUT_PWD/codeattributions.qdoc)
--qtattributionsscanner.CONFIG += phony
--QMAKE_EXTRA_TARGETS += qtattributionsscanner
--
- doc_command = $$QDOC $$QMAKE_DOCS
- prepare_docs {
-     prepare_docs.commands += $$doc_command -prepare $$PREP_DOC_INDEXES -no-link-errors
-     generate_docs.commands += $$doc_command -generate $$DOC_INDEXES
--    prepare_docs.depends += qtattributionsscanner
- } else {
-     html_docs.commands += $$doc_command $$DOC_INDEXES
--    html_docs.depends += qtattributionsscanner
- }
- 
- !build_online_docs {
diff --git a/debian/patches/series b/debian/patches/series
index b4483ef..6c5e6bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,3 @@ nonlinux_utime.diff
 
 # Ubuntu specific.
 #enable-tests.patch
-revert-automatic-code-attribution-docs.patch

-- 
qtbase packaging