r18625 - in /desktop/experimental/epiphany-webkit/debian: control control.in

[kov at users.alioth.debian.org]

Author: kov
Date: Tue Mar  3 22:43:00 2009
New Revision: 18625

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18625
Log:
make epiphany-webkit-dev conflict with epiphany-browser-dev

Modified:
    desktop/experimental/epiphany-webkit/debian/control
    desktop/experimental/epiphany-webkit/debian/control.in

Modified: desktop/experimental/epiphany-webkit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/control?rev=18625&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/control (original)
+++ desktop/experimental/epiphany-webkit/debian/control Tue Mar  3 22:43:00 2009
@@ -85,12 +85,13 @@
 Architecture: all
 Section: devel
 Depends: epiphany-webkit (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2)
+Conflicts: epiphany-browser-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
  compliance.
  .
- This package is required to develop extensions for Epiphany.
+ This package is required to develop extensions for Epiphany/WebKitGTK+.
 
 Package: epiphany-webkit-dbg
 Architecture: any

Modified: desktop/experimental/epiphany-webkit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/control.in?rev=18625&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/control.in (original)
+++ desktop/experimental/epiphany-webkit/debian/control.in Tue Mar  3 22:43:00 2009
@@ -85,12 +85,13 @@
 Architecture: all
 Section: devel
 Depends: epiphany-webkit (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2)
+Conflicts: epiphany-browser-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
  compliance.
  .
- This package is required to develop extensions for Epiphany.
+ This package is required to develop extensions for Epiphany/WebKitGTK+.
 
 Package: epiphany-webkit-dbg
 Architecture: any