[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.7.4-4-7-g7bb616b

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=d61214e

The following commit has been merged in the master branch:
commit d61214eb7734a244d9feffff45e5e83647ef3747
Author: Modestas Vainius <modax at debian.org>
Date:   Sun May 13 00:18:53 2012 +0300

    Add temporary Build-Conflicts against libqtwebkit-dev << 2.2.1.
    
    This will delay kde4libs build until both multi-arch Qt and multi-arch QtWebKit
    are available.
---
 debian/changelog |    3 +++
 debian/control   |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8dc1582..a94fda1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ kde4libs (4:4.7.4-5) UNRELEASED; urgency=low
     the build with GCC 4.7; patch upstream_Add-missing-include.patch.
   * Bump Standards-Version to 3.9.3, no changes required.
 
+  [ Modestas Vainius ]
+  * Add temporary Build-Conflicts against libqtwebkit-dev << 2.2.1.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 18 Mar 2012 09:22:26 +0100
 
 kde4libs (4:4.7.4-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index c46ec7a..b003c30 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.4), pkg-kde-tools (>= 0.14),
  libutempter-dev, liblzma-dev, libattica-dev (>= 0.1.90), shared-desktop-ontologies (>= 0.6.50),
  libpolkit-qt-1-dev (>= 0.99.0), libxss-dev, libqca2-dev, libdbusmenu-qt-dev, docbook-xml, docbook-xsl,
  libxrender-dev, libkrb5-dev, libudev-dev [linux-any]
+Build-Conflicts: libqtwebkit-dev (<< 2.2.1)
 Standards-Version: 3.9.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git

-- 
KDE Development Platform Libraries module packaging