[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.1.3-2-5-g2121c68

[Mike Hommey]

The following commit has been merged in the debian/experimental branch:
commit 568dfb4e486335207c6f6fd49356469965ae0575
Author: Mike Hommey <glandium at debian.org>
Date:   Fri Mar 27 20:52:06 2009 +0100

    libwebkit-dev doesn't need an outdated conflict with libwebkitgdk-dev

diff --git a/debian/changelog b/debian/changelog
index 09fbe91..fea8f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ webkit (1.1.3-3) UNRELEASED; urgency=low
   [ Mike Hommey ]
   * autotoolsconfig.h.in:
   - Brown paper bag fix to add missing AC_DEFINEs.
+  * debian/control:
+  - libwebkit-dev doesn't need an outdated conflict with libwebkitgdk-dev.
 
  -- Gustavo Noronha Silva <kov at debian.org>  Fri, 27 Mar 2009 16:28:06 -0300
 
diff --git a/debian/control b/debian/control
index 863551d..894114c 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ Section: libdevel
 Priority: extra
 Architecture: all
 Depends: libwebkit-1.0-2 (>= ${source:Upstream-Version}), libgtk2.0-dev, libsoup2.4-dev (>= 2.25.91)
-Conflicts: libwebkitgdk-dev
 Description: Web content engine library for Gtk+ - Development files
  WebKit is a web content engine, derived from KHTML and KJS from KDE, and
  used primarily in Apple's Safari browser.  It is made to be embedded in

-- 
WebKit Debian packaging