[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-beta+dfsg-3-22-g0aa01c7

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 0aa01c759dcec512959a8a136a0b4e896b82706b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jan 6 21:30:13 2016 +0300

    Exclude qdoc documentation from debian/qtbase5-doc-html.install.
---
 debian/changelog                | 2 ++
 debian/qtbase5-doc-html.install | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b5feb0e..a5af1b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ qtbase-opensource-src (5.6.0~beta+dfsg-4) UNRELEASED; urgency=medium
   * When merging install files, take DEB_HOST_ARCH_CPU into account, instead of
     DEB_HOST_ARCH. This is much more useful for us, because it allows us not to
     ship identical files for i386, hurd-i386 and kfreebsd-i386.
+  * Exclude qdoc documentation from debian/qtbase5-doc-html.install (moved to
+    qttools module).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 05 Jan 2016 21:05:06 +0300
 
diff --git a/debian/qtbase5-doc-html.install b/debian/qtbase5-doc-html.install
index 6dc83d1..f307de3 100644
--- a/debian/qtbase5-doc-html.install
+++ b/debian/qtbase5-doc-html.install
@@ -1,4 +1,3 @@
-usr/share/qt5/doc/qdoc/
 usr/share/qt5/doc/qmake/
 usr/share/qt5/doc/qtconcurrent/
 usr/share/qt5/doc/qtcore/

-- 
qtbase packaging