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

Mike Hommey glandium at debian.org
Fri Mar 27 20:03:27 UTC 2009


The following commit has been merged in the debian/experimental branch:
commit 1261f0964f1b8f83807da70a79a198c516dd36a4
Author: Mike Hommey <glandium at debian.org>
Date:   Fri Mar 27 20:53:42 2009 +0100

    libwebkit-1.0-2-dbg doesn't need to conflict/replace libwebkit-1.0-1-dbg

diff --git a/debian/changelog b/debian/changelog
index fea8f1d..7686b75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ webkit (1.1.3-3) UNRELEASED; urgency=low
   - Brown paper bag fix to add missing AC_DEFINEs.
   * debian/control:
   - libwebkit-dev doesn't need an outdated conflict with libwebkitgdk-dev.
+  - libwebkit-1.0-2-dbg doesn't need to conflict/replace libwebkit-1.0-1-dbg
+    thanks to the changes in previous release.
 
  -- Gustavo Noronha Silva <kov at debian.org>  Fri, 27 Mar 2009 16:28:06 -0300
 
diff --git a/debian/control b/debian/control
index 894114c..f016f09 100644
--- a/debian/control
+++ b/debian/control
@@ -58,8 +58,6 @@ Section: libdevel
 Priority: extra
 Architecture: any
 Depends: libwebkit-1.0-2 (= ${binary:Version})
-Conflicts: libwebkit-1.0-1-dbg
-Replaces: libwebkit-1.0-1-dbg
 Description: Web content engine library for Gtk+ - Debugging symbols
  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



More information about the Pkg-webkit-commits mailing list