[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.0+dfsg-1-262-g84f9758

[Simon Quigley]

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

The following commit has been merged in the ubuntu+1 branch:
commit 4f1a81b29ea250c4aae7610b05e67968303cb354
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sun Jun 11 19:26:47 2017 -0500

    I accidentally did this commit on upstream's dev branch, this does it on upstream's 5.9.0 branch so there's no fuzz.
---
 debian/patches/revert-automatic-code-attribution-docs.patch | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/patches/revert-automatic-code-attribution-docs.patch b/debian/patches/revert-automatic-code-attribution-docs.patch
index d26f793..d72c091 100644
--- a/debian/patches/revert-automatic-code-attribution-docs.patch
+++ b/debian/patches/revert-automatic-code-attribution-docs.patch
@@ -1,6 +1,6 @@
-commit f5b46f59524cae0b2ee5dc577c75c3d2cdd76ab9
+commit 6c68df6c30572cebdcc1a0db7e40170a3ccbcc54
 Author: Simon Quigley <tsimonq2 at ubuntu.com>
-Date:   Sun Jun 11 19:04:52 2017 -0500
+Date:   Sun Jun 11 19:23:37 2017 -0500
 
     Revert "Automatically generate code attribution documentation"
     
@@ -8,14 +8,13 @@ Date:   Sun Jun 11 19:04:52 2017 -0500
     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.
+    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 a18396876d..bb7ffa8f45 100644
+index 0c22d70529..9838ce3d89 100644
 --- a/doc/global/config.qdocconf
 +++ b/doc/global/config.qdocconf
-@@ -10,7 +10,7 @@ dita.metadata.default.audience = programmer
+@@ -10,6 +10,6 @@ dita.metadata.default.audience = programmer
  #Set the main Qt index.html
  navigation.homepage = "Qt $QT_VER"
  
@@ -23,7 +22,6 @@ index a18396876d..bb7ffa8f45 100644
 +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

-- 
qtbase packaging