[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.0+dfsg-5-9-g032b314

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 032b314e549496d2cb78f54e345f2654c1bf57d8
Author: Rohan Garg <rohan at kde.org>
Date:   Thu Feb 19 17:59:13 2015 +0100

    Improve globbing for the qtbase5-dev install file
---
 debian/changelog                  | 1 +
 debian/qtbase5-dev.install-common | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f3b53e..a2b0ab5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qtbase-opensource-src (5.4.0+dfsg-6) UNRELEASED; urgency=medium
 
   [ Rohan Garg ]
   * Make sure we strip out the 'git' keyword when looking for changelogs to install
+  * Improve globbing for the qtbase5-dev install file
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Feb 2015 11:13:59 -0300
 
diff --git a/debian/qtbase5-dev.install-common b/debian/qtbase5-dev.install-common
index e68fd97..af338fa 100644
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install-common
@@ -1626,11 +1626,7 @@ usr/lib/*/pkgconfig/Qt5Xml.pc
 usr/share/qt5/doc/global/compat.qdocconf
 usr/share/qt5/doc/global/config.qdocconf
 usr/share/qt5/doc/global/externalsites.qdocconf
-usr/share/qt5/doc/global/externalsites/external-resources.qdoc
-usr/share/qt5/doc/global/externalsites/qch-urls.qdoc
-usr/share/qt5/doc/global/externalsites/qt-webpages.qdoc
-usr/share/qt5/doc/global/externalsites/qtcreator.qdoc
-usr/share/qt5/doc/global/externalsites/rfc.qdoc
+usr/share/qt5/doc/global/externalsites/*
 usr/share/qt5/doc/global/fileextensions.qdocconf
 usr/share/qt5/doc/global/html-config.qdocconf
 usr/share/qt5/doc/global/html-footer-online.qdocconf

-- 
qtbase packaging