Fix the divert problem

4 files changed, 12 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index b59a918b..4753a375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zenity (2.6.1-2) experimental; urgency=low
+
+  * Build-Depend on intltool (closes: #245022)
+  * preinst: rm gdialog.real, I broke the diverts earlier and gnome-utils
+    should have removed it for me. (closes: #244982)
+
+ -- Ross Burton <ross@debian.org>  Wed, 21 Apr 2004 08:12:09 +0100
+
 zenity (2.6.1-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 57c0231e..f6b3ff45 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: zenity
 Section: gnome
 Priority: optional
 Maintainer: Ross Burton <ross@debian.org>
-Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, scrollkeeper (>= 0.3.9), libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libgnomecanvas2-dev
+Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, intltool, scrollkeeper (>= 0.3.9), libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libgnomecanvas2-dev
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Rob Taylor <robtaylor@fastmail.fm>, Robert McQueen <robot101@debian.org>, Sebastien Bacher <seb128@debian.org>, Takuo KITAME <kitame@debian.org>
 Standards-Version: 3.6.1.0
 
diff --git a/debian/control.in b/debian/control.in
index ef74e5f5..f8978700 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,7 @@ Source: zenity
 Section: gnome
 Priority: optional
 Maintainer: Ross Burton <ross@debian.org>
-Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, scrollkeeper (>= 0.3.9), libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libgnomecanvas2-dev
+Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, intltool, scrollkeeper (>= 0.3.9), libgtk2.0-dev (>= 2.4.0), libglade2-dev, libgconf2-dev, libgnomecanvas2-dev
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.6.1.0
 
diff --git a/debian/preinst b/debian/preinst
index 886d11a3..0c6b6fb4 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -4,6 +4,8 @@ set -e
 
 if [ "install" = "$1" ] || [ "upgrade" = "$1" ]; then
     if [ "`dpkg-divert --list zenity`" != "" ]; then
+        # I borked the divert earlier, this is left behind from gnome-utils.
+        rm -f /usr/bin/gdialog.real
         dpkg-divert --package zenity --remove /usr/bin/gdialog
     fi
 fi