[SCM] Qt 4 packaging branch, master, updated. debian/4.8.2+dfsg-2-3-g3b67939

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 3b6793941f4c7bde272fb610eef6574255b4f826
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Nov 23 18:10:37 2012 -0300

    Build-conflict against libqtwebkit-dev.
    
    Upstream said that this should be the correct way of handling this.
---
 debian/changelog |    2 ++
 debian/control   |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1419e1c..f0139c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qt4-x11 (4:4.8.2+dfsg-3) UNRELEASED; urgency=low
   * Apply disable-SSL-compression-by-default.patch. Disables SSL compression
     by default since this appears to be the a likely cause of the currently
     hyped CRIME attack.
+  * Build-conflict against libqtwebkit-dev. Upstream said that this should be
+    the correct way of handling this (Closes: #689265).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 23 Nov 2012 18:01:31 -0300
 
diff --git a/debian/control b/debian/control
index b9fd6a4..acf7240 100644
--- a/debian/control
+++ b/debian/control
@@ -56,6 +56,7 @@ Build-Depends: debhelper (>= 9),
                rsync,
                unixodbc-dev,
                zlib1g-dev
+Build-Conflicts: libqtwebkit-dev
 Standards-Version: 3.9.3
 Homepage: http://qt-project.org/
 Vcs-Git: git://git.debian.org/pkg-kde/qt/qt4-x11.git

-- 
Qt 4 packaging