r21550 - in /desktop/unstable/epiphany-browser/debian: control control.in

[kov at users.alioth.debian.org]

Author: kov
Date: Thu Sep 24 23:05:15 2009
New Revision: 21550

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21550
Log:
Fix Conflict, add Replaces to epiphany-browser-dev

Modified:
    desktop/unstable/epiphany-browser/debian/control
    desktop/unstable/epiphany-browser/debian/control.in

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=21550&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Thu Sep 24 23:05:15 2009
@@ -97,7 +97,8 @@
          epiphany-browser-data (= ${source:Version}),
          libgtk2.0-dev (>= 2.16.0),
          libwebkit-dev
-Conflicts: epiphany-browser-dev
+Conflicts: epiphany-webkit-dev
+Replaces: epiphany-webkit-dev
 Description: Development files for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=21550&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Thu Sep 24 23:05:15 2009
@@ -97,7 +97,8 @@
          epiphany-browser-data (= ${source:Version}),
          libgtk2.0-dev (>= 2.16.0),
          libwebkit-dev
-Conflicts: epiphany-browser-dev
+Conflicts: epiphany-webkit-dev
+Replaces: epiphany-webkit-dev
 Description: Development files for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards