[SCM] Qt 4 packaging branch, master, updated. debian/4.8.1-1-2-ga7c3316

[Didier Raboud]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=a7c3316

The following commit has been merged in the master branch:
commit a7c3316335b8cb679c2afacfa05e7c392a9248e0
Author: Didier Raboud <odyx at debian.org>
Date:   Thu May 3 22:02:28 2012 +0200

    Add libqt4-dev Breaks against libphonon-dev << multiarch.
    
    Breaks against libphonon-dev << 4:4.6.0.0-1+exp1~ because otherwise
    phonon might not be there in its multiarch'ed version, hence might not
    be detected by the usual cmake Qt modules detectors.
---
 debian/changelog |    5 +++++
 debian/control   |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb6de21..dee54b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qt4-x11 (4:4.8.1-2) UNRELEASED; urgency=low
 
+  [ Didier Raboud ]
+  * Add libqt4-dev Breaks against libphonon-dev << 4:4.6.0.0-1+exp1~
+    because otherwise phonon might not be there in its multiarch'ed
+    version, hence might not be detected by the usual cmake Qt modules
+    detectors.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 May 2012 21:58:22 +0200
 
diff --git a/debian/control b/debian/control
index 8f57d33..0d0cdfd 100644
--- a/debian/control
+++ b/debian/control
@@ -536,7 +536,8 @@ Depends: libqt4-dbus (= ${binary:Version}),
 Recommends: libqt4-opengl-dev (= ${binary:Version}), libqtwebkit-dev (>= 2.0~)
 Breaks: g++-4.6 (<< 4.6.0-7~) [armel],
         libqt4-opengl-dev (<< 4.4.0-2),
-        libqtwebkit-dev (<< 2.0~)
+        libqtwebkit-dev (<< 2.0~),
+        libphonon4-dev (<< 4:4.6.0.0-1+exp1~)
 Replaces: libqt4-opengl-dev (<< 4.4.0-2), libqtwebkit-dev (<< 2.0~)
 Suggests: firebird-dev,
           libmysqlclient-dev,

-- 
Qt 4 packaging