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

[kov at users.alioth.debian.org]

Author: kov
Date: Thu Sep 24 21:45:01 2009
New Revision: 21533

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21533
Log:
Fix broken package relations

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=21533&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/control [utf-8] Thu Sep 24 21:45:01 2009
@@ -1,4 +1,4 @@
-Source: epiphany-webkit
+Source: epiphany-browser
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
@@ -42,21 +42,22 @@
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/epiphany-webkit/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/epiphany-webkit/
 
-Package: epiphany-webkit
+Package: epiphany-browser
 Architecture: any
-Depends: epiphany-webkit-data (>= ${gnome:Version}),
-         epiphany-webkit-data (<< ${gnome:NextVersion}),
+Depends: epiphany-browser-data (>= ${gnome:Version}),
+         epiphany-browser-data (<< ${gnome:NextVersion}),
          ${shlibs:Depends},
          gnome-icon-theme (>= 2.9.90),
          dbus-x11,
          iso-codes,
          ${misc:Depends}
-Conflicts: epiphany-browser (<< 2.20),
+Conflicts: epiphany-gecko,
+           epiphany-webkit,
            epiphany-extensions (<< 2.22.1-3)
 Recommends: yelp
 Suggests: mozplugger
 Provides: www-browser, gnome-www-browser
-Description: Intuitive GNOME web browser - WebKitGTK+ version
+Description: Intuitive GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at
  non-technical users. Its principles are simplicity and standards
  compliance. Simplicity is achieved by a well designed user interface
@@ -66,15 +67,13 @@
  WebKitGTK+ rendering engine; and on the user interface side by
  closely following the GNOME Human Interface Guidelines (HIG) and by
  close integration with the GNOME desktop.
- .
- This version uses the WebKitGTK+ backend to render web pages.
 
-Package: epiphany-webkit-data
+Package: epiphany-browser-data
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: epiphany-webkit
-Conflicts: epiphany-browser (<< 2.20)
-Replaces: epiphany-browser (<< 2.20)
+Recommends: epiphany-browser
+Conflicts: epiphany-browser (<< 2.20), epiphany-webkit-data
+Replaces: epiphany-browser (<< 2.20), epiphany-webkit-data
 Description: Data 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
@@ -83,11 +82,11 @@
  This package contains the common files, artwork and translations for
  Epiphany.
 
-Package: epiphany-webkit-dev
+Package: epiphany-browser-dev
 Architecture: all
 Section: devel
-Depends: epiphany-webkit (>= ${binary:Version}),
-         epiphany-webkit-data (= ${source:Version}),
+Depends: epiphany-browser (>= ${binary:Version}),
+         epiphany-browser-data (= ${source:Version}),
          libgtk2.0-dev (>= 2.16.0),
          libwebkit-dev
 Conflicts: epiphany-browser-dev
@@ -98,11 +97,11 @@
  .
  This package is required to develop extensions for Epiphany/WebKitGTK+.
 
-Package: epiphany-webkit-dbg
+Package: epiphany-browser-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: epiphany-webkit (= ${binary:Version})
+Depends: epiphany-browser (= ${binary:Version})
 Recommends: libwebkit-1.0-2-dbg
 Description: Debugging symbols for the GNOME web browser
  Epiphany is a simple yet powerful GNOME web browser targeted at

Modified: desktop/experimental/epiphany-webkit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/control.in?rev=21533&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/control.in [utf-8] Thu Sep 24 21:45:01 2009
@@ -51,7 +51,8 @@
          dbus-x11,
          iso-codes,
          ${misc:Depends}
-Conflicts: epiphany-webkit, epiphany-gecko
+Conflicts: epiphany-gecko,
+           epiphany-webkit,
            epiphany-extensions (<< 2.22.1-3)
 Recommends: yelp
 Suggests: mozplugger