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

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Sep  1 21:20:45 2008
New Revision: 16862

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16862
Log:
Conflict with libgtkada2-bin; closes: #497456.

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=16862&op=diff
==============================================================================
--- desktop/unstable/zenity/debian/changelog (original)
+++ desktop/unstable/zenity/debian/changelog Mon Sep  1 21:20:45 2008
@@ -1,3 +1,9 @@
+zenity (2.22.1-2) UNRELEASED; urgency=low
+
+  * Conflict with libgtkada2-bin; closes: #497456.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 01 Sep 2008 23:20:19 +0200
+
 zenity (2.22.1-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/zenity/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/zenity/debian/control?rev=16862&op=diff
==============================================================================
--- desktop/unstable/zenity/debian/control (original)
+++ desktop/unstable/zenity/debian/control Mon Sep  1 21:20:45 2008
@@ -15,7 +15,7 @@
                gnome-doc-utils (>= 0.3.2),
                libnotify-dev (>= 0.4.3-2),
                libnotify-dev-gtk2.10
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
 Standards-Version: 3.7.3
 
 Package: zenity
@@ -23,6 +23,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          scrollkeeper
+Conflicts: libgtkada2-bin
 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=16862&op=diff
==============================================================================
--- desktop/unstable/zenity/debian/control.in (original)
+++ desktop/unstable/zenity/debian/control.in Mon Sep  1 21:20:45 2008
@@ -23,6 +23,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          scrollkeeper
+Conflicts: libgtkada2-bin
 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.