r24140 - in /desktop/unstable/eog/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Apr 30 02:40:41 2010
New Revision: 24140

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24140
Log:
Drop Conflicts: eog2, no longer necessary.

Modified:
    desktop/unstable/eog/debian/changelog
    desktop/unstable/eog/debian/control
    desktop/unstable/eog/debian/control.in

Modified: desktop/unstable/eog/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/changelog?rev=24140&op=diff
==============================================================================
--- desktop/unstable/eog/debian/changelog [utf-8] (original)
+++ desktop/unstable/eog/debian/changelog [utf-8] Fri Apr 30 02:40:41 2010
@@ -18,6 +18,7 @@
     - Remove /usr/share/cdbs/1/rules/simple-patchsys.mk from debian/rules.
   * debian/control.in
     - Add Vcs-* fields.
+    - Drop Conflicts: eog2, no longer necessary.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 30 Apr 2010 04:30:42 +0200
 

Modified: desktop/unstable/eog/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/control?rev=24140&op=diff
==============================================================================
--- desktop/unstable/eog/debian/control [utf-8] (original)
+++ desktop/unstable/eog/debian/control [utf-8] Fri Apr 30 02:40:41 2010
@@ -45,7 +45,6 @@
          gnome-icon-theme (>= 2.19.1),
          shared-mime-info (>= 0.20)
 Recommends: librsvg2-common
-Conflicts: eog2
 Description: Eye of GNOME graphics viewer program
  eog or the Eye of GNOME is a simple graphics viewer for the GNOME 
  desktop which uses the gdk-pixbuf library.  It can deal with large 

Modified: desktop/unstable/eog/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/control.in?rev=24140&op=diff
==============================================================================
--- desktop/unstable/eog/debian/control.in [utf-8] (original)
+++ desktop/unstable/eog/debian/control.in [utf-8] Fri Apr 30 02:40:41 2010
@@ -40,7 +40,6 @@
          gnome-icon-theme (>= 2.19.1),
          shared-mime-info (>= 0.20)
 Recommends: librsvg2-common
-Conflicts: eog2
 Description: Eye of GNOME graphics viewer program
  eog or the Eye of GNOME is a simple graphics viewer for the GNOME 
  desktop which uses the gdk-pixbuf library.  It can deal with large