r25829 - in /desktop/experimental/gtk+2.0/debian: control control.in

[bigon at users.alioth.debian.org]

Author: bigon
Date: Thu Dec  9 19:05:48 2010
New Revision: 25829

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25829
Log:
Readd lost Conflicts

Modified:
    desktop/experimental/gtk+2.0/debian/control
    desktop/experimental/gtk+2.0/debian/control.in

Modified: desktop/experimental/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control?rev=25829&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/control [utf-8] Thu Dec  9 19:05:48 2010
@@ -226,7 +226,7 @@
          ${misc:Depends},
          ${shlibs:Depends},
          ${gir:Depends}
-Conflicts: gir1.0-gtk-2.0
+Conflicts: gobject-introspection-repository, gir1.0-gtk-2.0
 Replaces: gir1.0-gtk-2.0
 Description: The GTK+ graphical user interface library -- gir bindings
  The GTK+ is a multi-platform toolkit for creating graphical user

Modified: desktop/experimental/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control.in?rev=25829&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/control.in [utf-8] Thu Dec  9 19:05:48 2010
@@ -226,7 +226,7 @@
          ${misc:Depends},
          ${shlibs:Depends},
          ${gir:Depends}
-Conflicts: gir1.0-gtk-2.0
+Conflicts: gobject-introspection-repository, gir1.0-gtk-2.0
 Replaces: gir1.0-gtk-2.0
 Description: The GTK+ graphical user interface library -- gir bindings
  The GTK+ is a multi-platform toolkit for creating graphical user