[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.0+dfsg-4-25-g199b71b

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 7f8968972ca181e32b4b10db8a3821d418e16f0d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Feb 9 12:49:32 2015 -0300

    Revert "qeglcompositor_p.h is no longer installed."
    
    This reverts commit 2c696d02c482f8bbb2835dd002ae4bcc14b5cba6.
---
 debian/changelog                   | 2 --
 debian/qtbase5-private-dev.install | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c763e9..00cacc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,6 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
   * Remove libopenvg1-mesa-dev as a build dependency because mesa does not
     builds it anymore (Closes: #777341).
     Thanks Andreas Beckmann for the report.
-    - Fix qtbase5-private-dev.install, qeglcompositor_p.h is no longer
-      installed.
   * Remove the patches Pino replaced above as they are already present
     in this version of the code.
   * Update gnukfreebsd.diff to continue applying.
diff --git a/debian/qtbase5-private-dev.install b/debian/qtbase5-private-dev.install
index bbd9af8..99010cb 100644
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@ -422,6 +422,7 @@ usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qbasicfontdataba
 usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qcfsocketnotifier_p.h
 usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qcoretextfontdatabase_p.h
 usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qdevicediscovery_p.h
+usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qeglcompositor_p.h
 usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qeglconvenience_p.h
 usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qeglpbuffer_p.h
 usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qeglplatformbackingstore_p.h

-- 
qtbase packaging