[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-5-5-gf1546b3

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit f1546b36d91210073940731bdd00f0cf39cb82dc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Feb 19 11:47:31 2015 -0300

    Headers installed into a versioned directory are always private.
---
 debian/changelog                   |  3 +++
 debian/qtbase5-private-dev.install | 23 +++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad438c4..d8c51fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ qtbase-opensource-src (5.4.0+dfsg-6) UNRELEASED; urgency=medium
   * Move some OpenGL-related headers from qtbase5-dev.install-common to
     libqt5opengl5-dev.install.
     - Add proper Breaks and Replaces to libqt5opengl5-dev.
+  * Headers installed into a versioned directory are always private. Simplify
+    even further qtbase5-private-dev.install. Moreover this directories will
+    always start with 5 during Qt 5's lifetime.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Feb 2015 11:13:59 -0300
 
diff --git a/debian/qtbase5-private-dev.install b/debian/qtbase5-private-dev.install
index e88358d..be85324 100644
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@ -1,19 +1,18 @@
-usr/include/*/qt5/QtCore/5.*/QtCore/*
-usr/include/*/qt5/QtDBus/5.*/QtDBus/*
-usr/include/*/qt5/QtGui/5.*/QtGui/*
-usr/include/*/qt5/QtNetwork/5.*/QtNetwork/*
-usr/include/*/qt5/QtOpenGL/5.*/QtOpenGL/*
-usr/include/*/qt5/QtPlatformSupport/5.*/QtPlatformSupport/*
+usr/include/*/qt5/QtCore/5.*/*
+usr/include/*/qt5/QtDBus/5.*/*
+usr/include/*/qt5/QtGui/5.*/*
+usr/include/*/qt5/QtNetwork/5.*/*
+usr/include/*/qt5/QtOpenGL/5.*/*
+usr/include/*/qt5/QtPlatformSupport/5.*/*
 usr/include/*/qt5/QtPlatformSupport/QtPlatformSupport
 usr/include/*/qt5/QtPlatformSupport/QtPlatformSupportDepends
 usr/include/*/qt5/QtPlatformSupport/QtPlatformSupportVersion
 usr/include/*/qt5/QtPlatformSupport/qtplatformsupportversion.h
-usr/include/*/qt5/QtPrintSupport/5.*/QtPrintSupport/*
-usr/include/*/qt5/QtPrintSupport/5.*/QtPrintSupport/qpa/*
-usr/include/*/qt5/QtSql/5.*/QtSql/*
-usr/include/*/qt5/QtTest/5.*/QtTest/*
-usr/include/*/qt5/QtWidgets/5.*/QtWidgets/*
-usr/include/*/qt5/QtXml/5.*/QtXml/*
+usr/include/*/qt5/QtPrintSupport/5.*/*
+usr/include/*/qt5/QtSql/5.*/*
+usr/include/*/qt5/QtTest/5.*/*
+usr/include/*/qt5/QtWidgets/5.*/*
+usr/include/*/qt5/QtXml/5.*/*
 usr/lib/*/libQt5PlatformSupport.a
 usr/lib/*/libQt5PlatformSupport.prl
 usr/lib/*/pkgconfig/Qt5PlatformSupport.pc

-- 
qtbase packaging