r27592 - in /desktop/experimental/eog/debian: changelog control control.in

[fabian-guest at users.alioth.debian.org]

Author: fabian-guest
Date: Fri Apr 15 11:29:38 2011
New Revision: 27592

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27592
Log:
Add Conflicts and Replaces against gir1.2-eog-3.0 to eog (Closes: #622636).

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

Modified: desktop/experimental/eog/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/changelog?rev=27592&op=diff
==============================================================================
--- desktop/experimental/eog/debian/changelog [utf-8] (original)
+++ desktop/experimental/eog/debian/changelog [utf-8] Fri Apr 15 11:29:38 2011
@@ -1,3 +1,9 @@
+eog (3.0.0-2) UNRELEASED; urgency=low
+
+  * Add Conflicts and Replaces against gir1.2-eog-3.0 to eog (Closes: #622636).
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Fri, 15 Apr 2011 22:29:03 +0200
+
 eog (3.0.0-1) experimental; urgency=low
 
   * Make the -dev package depend on the gir package.

Modified: desktop/experimental/eog/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/control?rev=27592&op=diff
==============================================================================
--- desktop/experimental/eog/debian/control [utf-8] (original)
+++ desktop/experimental/eog/debian/control [utf-8] Fri Apr 15 11:29:38 2011
@@ -51,6 +51,8 @@
          gsettings-desktop-schemas (>= 2.91.92)
 Recommends: librsvg2-common
 Breaks: eog-plugins (<< 2.91)
+Conflicts: gir1.2-eog-3.0
+Replaces: gir1.2-eog-3.0
 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/experimental/eog/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eog/debian/control.in?rev=27592&op=diff
==============================================================================
--- desktop/experimental/eog/debian/control.in [utf-8] (original)
+++ desktop/experimental/eog/debian/control.in [utf-8] Fri Apr 15 11:29:38 2011
@@ -46,6 +46,8 @@
          gsettings-desktop-schemas (>= 2.91.92)
 Recommends: librsvg2-common
 Breaks: eog-plugins (<< 2.91)
+Conflicts: gir1.2-eog-3.0
+Replaces: gir1.2-eog-3.0
 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