[SCM] qtmultimedia packaging branch, master, updated. 5c5d7775bf662531c6c3e3b4804775bde0649eb0

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 5c5d7775bf662531c6c3e3b4804775bde0649eb0
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 28 10:10:54 2013 +0200

    simplify depends/conflicts of qtmultimedia5-dev
    
    - remove all the gl-related stuff
    - turn qt5-qmake and qtbase5-dev-tools into just qtbase5-dev
    - remove obsolete icheck conflict
---
 debian/control |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index e4de1aa..7f059bd 100644
--- a/debian/control
+++ b/debian/control
@@ -126,17 +126,12 @@ Package: qtmultimedia5-dev
 Architecture: any
 Section: libdevel
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
-         libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
-         libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
-         libqgsttools-p1 (= ${binary:Version}),
+Depends: libqgsttools-p1 (= ${binary:Version}),
          libqt5multimedia5 (= ${binary:Version}),
          libqt5multimediaquick-p5 (= ${binary:Version}),
          libqt5multimediawidgets5 (= ${binary:Version}),
-         qt5-qmake,
-         qtbase5-dev-tools,
+         qtbase5-dev,
          ${misc:Depends}
-Conflicts: icheck
 Description: APIs for multimedia functionality - 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.

-- 
qtmultimedia packaging