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

[Lisandro Damián Nicanor Pérez]

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

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

    Move some OpenGL-related headers.
    
    They where wrongly installed in qtbase5-dev.
    Add proper Breaks and Replaces.
---
 debian/changelog                 | 3 +++
 debian/control                   | 2 ++
 debian/libqt5opengl5-dev.install | 1 +
 3 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 29fd14f..ad438c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtbase-opensource-src (5.4.0+dfsg-6) UNRELEASED; urgency=medium
   * Fix qtbase5-dev.install-common. I screwed up in the last upload and pushed
     private headers into it.
     - Bump qtbase5-private-dev's Breaks and Replaces.
+  * Move some OpenGL-related headers from qtbase5-dev.install-common to
+    libqt5opengl5-dev.install.
+    - Add proper Breaks and Replaces to libqt5opengl5-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Feb 2015 11:13:59 -0300
 
diff --git a/debian/control b/debian/control
index c52f5ee..7df1725 100644
--- a/debian/control
+++ b/debian/control
@@ -294,6 +294,8 @@ Suggests: firebird-dev,
           libpq-dev,
           libsqlite3-dev,
           unixodbc-dev
+Breaks: qtbase5-dev (<< 5.4.0+dfsg-6~)
+Replaces: qtbase5-dev (<< 5.4.0+dfsg-6~)
 Description: Qt 5 base development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/libqt5opengl5-dev.install b/debian/libqt5opengl5-dev.install
index 29e99b0..a92b7c9 100644
--- a/debian/libqt5opengl5-dev.install
+++ b/debian/libqt5opengl5-dev.install
@@ -12,6 +12,7 @@ usr/include/*/qt5/QtOpenGL/QGLShader
 usr/include/*/qt5/QtOpenGL/QGLShaderProgram
 usr/include/*/qt5/QtOpenGL/QGLWidget
 usr/include/*/qt5/QtOpenGL/QtOpenGL
+usr/include/*/qt5/QtOpenGL/QtOpenGLDepends
 usr/include/*/qt5/QtOpenGL/QtOpenGLVersion
 usr/include/*/qt5/QtOpenGL/qgl.h
 usr/include/*/qt5/QtOpenGL/qglbuffer.h

-- 
qtbase packaging