r28672 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Jun 24 23:57:36 2011
New Revision: 28672

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28672
Log:
Remove old Conflicts and Replaces which are no longer necessary.

Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/control
    desktop/experimental/epiphany-browser/debian/control.in

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=28672&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Fri Jun 24 23:57:36 2011
@@ -8,6 +8,7 @@
   * debian/control.in:
     - Bump Build-Depends on libsoup-gnome2.4-dev to (>= 2.33.1).
     - Bump Standards-Version to 3.9.2. No further changes.
+    - Remove old Conflicts and Replaces which are no longer necessary.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 24 Jun 2011 00:37:50 +0200
 

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=28672&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Fri Jun 24 23:57:36 2011
@@ -88,8 +88,6 @@
 Architecture: all
 Depends: ${misc:Depends}
 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
@@ -107,8 +105,6 @@
          ${misc:Depends},
          libgtk-3-dev (>= 3.0.2),
          libwebkitgtk-3.0-dev (>= 1.4.0)
-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/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=28672&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Fri Jun 24 23:57:36 2011
@@ -83,8 +83,6 @@
 Architecture: all
 Depends: ${misc:Depends}
 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
@@ -102,8 +100,6 @@
          ${misc:Depends},
          libgtk-3-dev (>= 3.0.2),
          libwebkitgtk-3.0-dev (>= 1.4.0)
-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