r20423 - in /desktop/unstable/zenity/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Jun 21 08:42:06 2009
New Revision: 20423

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20423
Log:
Only conflict with libgtkada-bin << 2.12.0-4, add replaces.
Closes: #533867.

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

Modified: desktop/unstable/zenity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/zenity/debian/changelog?rev=20423&op=diff
==============================================================================
--- desktop/unstable/zenity/debian/changelog (original)
+++ desktop/unstable/zenity/debian/changelog Sun Jun 21 08:42:06 2009
@@ -1,3 +1,10 @@
+zenity (2.26.0-2) UNRELEASED; urgency=low
+
+  * Only conflict with libgtkada-bin << 2.12.0-4, add replaces.
+    Closes: #533867.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 21 Jun 2009 10:41:27 +0200
+
 zenity (2.26.0-1) unstable; urgency=low
 
   [ Luca Bruno ]

Modified: desktop/unstable/zenity/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/zenity/debian/control?rev=20423&op=diff
==============================================================================
--- desktop/unstable/zenity/debian/control (original)
+++ desktop/unstable/zenity/debian/control Sun Jun 21 08:42:06 2009
@@ -19,7 +19,8 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libgtkada2-bin
+Conflicts: libgtkada2-bin (<< 2.12.0-4)
+Replaces: libgtkada2-bin (<< 2.12.0-4)
 Description: Display graphical dialog boxes from shell scripts
  Zenity allows you to display GTK+ dialogs from shell scripts; it is a
  rewrite of the `gdialog' command from GNOME 1.

Modified: desktop/unstable/zenity/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/zenity/debian/control.in?rev=20423&op=diff
==============================================================================
--- desktop/unstable/zenity/debian/control.in (original)
+++ desktop/unstable/zenity/debian/control.in Sun Jun 21 08:42:06 2009
@@ -19,7 +19,8 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libgtkada2-bin
+Conflicts: libgtkada2-bin (<< 2.12.0-4)
+Replaces: libgtkada2-bin (<< 2.12.0-4)
 Description: Display graphical dialog boxes from shell scripts
  Zenity allows you to display GTK+ dialogs from shell scripts; it is a
  rewrite of the `gdialog' command from GNOME 1.