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

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 04c048339765c4881e60d583b37ae931ff4719cf
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Feb 17 18:07:55 2015 +0300

    Move QtOpenGL CMake files from qtbase5-dev to libqt5opengl5-dev.
---
 debian/changelog                  | 1 +
 debian/control                    | 2 ++
 debian/libqt5opengl5-dev.install  | 2 ++
 debian/qtbase5-dev.install-common | 2 --
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4d5425..4827d19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
   * Drop private marks from QCollator and QOpenGLWidget symbols.
   * Remove references to ia64 and s390 from the symbols files.
     Build logs for these architectures are no longer available.
+  * Move QtOpenGL CMake files from qtbase5-dev to libqt5opengl5-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Dec 2014 23:42:00 +0100
 
diff --git a/debian/control b/debian/control
index f88794d..b9b2e04 100644
--- a/debian/control
+++ b/debian/control
@@ -327,6 +327,8 @@ Section: libdevel
 Depends: libqt5opengl5 (= ${binary:Version}),
          qtbase5-dev (= ${binary:Version}),
          ${misc:Depends}
+Breaks: qtbase5-dev (<< 5.4.0+dfsg-5~)
+Replaces: qtbase5-dev (<< 5.4.0+dfsg-5~)
 Description: Qt 5 OpenGL library 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 41c9688..29e99b0 100644
--- a/debian/libqt5opengl5-dev.install
+++ b/debian/libqt5opengl5-dev.install
@@ -22,6 +22,8 @@ usr/include/*/qt5/QtOpenGL/qglpixelbuffer.h
 usr/include/*/qt5/QtOpenGL/qglshaderprogram.h
 usr/include/*/qt5/QtOpenGL/qtopenglglobal.h
 usr/include/*/qt5/QtOpenGL/qtopenglversion.h
+usr/lib/*/cmake/Qt5OpenGL/Qt5OpenGLConfig.cmake
+usr/lib/*/cmake/Qt5OpenGL/Qt5OpenGLConfigVersion.cmake
 usr/lib/*/libQt5OpenGL.prl
 usr/lib/*/libQt5OpenGL.so
 usr/lib/*/pkgconfig/Qt5OpenGL.pc
diff --git a/debian/qtbase5-dev.install-common b/debian/qtbase5-dev.install-common
index 906f968..4825124 100644
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install-common
@@ -1578,8 +1578,6 @@ usr/lib/*/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake
 usr/lib/*/cmake/Qt5Network/Qt5NetworkConfig.cmake
 usr/lib/*/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake
-usr/lib/*/cmake/Qt5OpenGL/Qt5OpenGLConfig.cmake
-usr/lib/*/cmake/Qt5OpenGL/Qt5OpenGLConfigVersion.cmake
 usr/lib/*/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake
 usr/lib/*/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake
 usr/lib/*/cmake/Qt5PrintSupport/Qt5PrintSupportConfig.cmake

-- 
qtbase packaging