[SCM] qtbase packaging branch, master, updated. 6d597a7108ddbea1295bb49780070f34581a20e2

[Fathi Boudra]

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

The following commit has been merged in the master branch:
commit 6d597a7108ddbea1295bb49780070f34581a20e2
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Sep 2 18:04:38 2012 +0300

    Add libgl/libglu dependency to qtbase5-dev (needed by QtGui,QtWidgets,
    QtPlatformSupport, QtPrintSupport)
---
 debian/control |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 724e818..358e443 100644
--- a/debian/control
+++ b/debian/control
@@ -16,10 +16,10 @@ Build-Depends: debhelper (>= 9),
                libdbus-1-dev,
                libfontconfig1-dev,
                libfreetype6-dev,
-               libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
+               libgl1-mesa-dev,
                libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
                libglib2.0-dev,
-               libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
+               libglu1-mesa-dev,
                libicu-dev,
                libjpeg-dev,
                libmysqlclient-dev,
@@ -257,7 +257,9 @@ Description: Qt 5 print support module
 Package: qtbase5-dev
 Architecture: any
 Section: libdevel
-Depends: libqtconcurrent5 (= ${binary:Version}),
+Depends: libgl1-mesa-dev,
+         libglu1-mesa-dev,
+         libqtconcurrent5 (= ${binary:Version}),
          libqtcore5 (= ${binary:Version}),
          libqtdbus5 (= ${binary:Version}),
          libqtgui5 (= ${binary:Version}),
@@ -312,9 +314,7 @@ Description: Qt 5 base private development files
 Package: libqtopengl5-dev
 Architecture: any
 Section: libdevel
-Depends: libgl1-mesa-dev,
-         libglu1-mesa-dev,
-         libqtopengl5 (= ${binary:Version}),
+Depends: libqtopengl5 (= ${binary:Version}),
          qtbase5-dev (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}

-- 
qtbase packaging