3 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 19487983..8804f013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zenity (2.22.1-2) UNRELEASED; urgency=low
+
+  * Conflict with libgtkada2-bin; closes: #497456.
+
+ -- Loic Minier <lool@dooz.org>  Mon, 01 Sep 2008 23:20:19 +0200
+
 zenity (2.22.1-1) unstable; urgency=low
 
   * New upstream bugfix release.
diff --git a/debian/control b/debian/control
index 9f4ecc10..e39d3d74 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 5),
                gnome-doc-utils (>= 0.3.2),
                libnotify-dev (>= 0.4.3-2),
                libnotify-dev-gtk2.10
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Guilherme de S. Pastore <gpastore@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
 Standards-Version: 3.7.3
 
 Package: zenity
@@ -23,6 +23,7 @@ Architecture: any
 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.
diff --git a/debian/control.in b/debian/control.in
index c6fe19b6..35b42e63 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -23,6 +23,7 @@ Architecture: any
 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.