6 files changed, 37 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index 1a331fe3..b8c2318e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+zenity (2.12.1-2) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Update watch file to end with an even digit. [debian/watch]
+
+  [ Josselin Mouette ]
+  * Upload to unstable.
+
+ -- Josselin Mouette <joss@debian.org>  Sun,  8 Jan 2006 16:37:55 +0100
+
+zenity (2.12.1-1) experimental; urgency=low
+
+  [ Guilherme de S. Pastore ]
+  * New upstream releases
+  * debian/control.in:
+    - added build dependency on gnome-doc-utils
+  * debian/rules:
+    - pass --disable-scrollkeeper to configure
+
+  [ Loic Minier ]
+  * Bump libglib2.0-dev build-dep to >= 2.7.3.
+  * Add CDBS' utils.
+  * Remove obsolete Conflict/Replace on gnome-utils.
+  * Drop obsolete debian/zenity/var cleanup.
+  * Update man page dash escaping patch, 00_man_escape_hyphens.diff.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 29 Oct 2005 16:22:16 +0200
+
 zenity (2.10.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index e19824bd..361e5752 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,13 @@ 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, intltool, scrollkeeper (>= 0.3.9), libpopt-dev, libgtk2.0-dev (>= 2.4.0), libglib2.0-dev (>= 2.6.0), libglade2-dev, libgnomecanvas2-dev, libxt-dev
+Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, intltool, scrollkeeper (>= 0.3.9), libpopt-dev, libgtk2.0-dev (>= 2.4.0), libglib2.0-dev (>= 2.7.3), libglade2-dev, libgnomecanvas2-dev, libxt-dev, gnome-doc-utils (>= 0.3.2)
 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>, Clément Stenac <zorglub@debian.org>, Ed Boraas <ed@debian.org>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Guilherme de S. Pastore <guilherme.pastore@terra.com.br>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <jr.debian@rohr.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Marc 'HE' Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Sebastien Bacher <seb128@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Takuo KITAME <kitame@debian.org>
 Standards-Version: 3.6.2.1
 
 Package: zenity
 Architecture: any
-Depends: ${shlibs:Depends}, scrollkeeper (>= 0.3.9)
-Replaces: gnome-utils (<< 2.4.1-1)
-Conflicts: gnome-utils (<< 2.4.1-1)
+Depends: ${misc:Depends}, ${shlibs:Depends}, scrollkeeper (>= 0.3.9)
 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 cda36ff7..84366d72 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,15 +2,13 @@ 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, intltool, scrollkeeper (>= 0.3.9), libpopt-dev, libgtk2.0-dev (>= 2.4.0), libglib2.0-dev (>= 2.6.0), libglade2-dev, libgnomecanvas2-dev, libxt-dev
+Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, intltool, scrollkeeper (>= 0.3.9), libpopt-dev, libgtk2.0-dev (>= 2.4.0), libglib2.0-dev (>= 2.7.3), libglade2-dev, libgnomecanvas2-dev, libxt-dev, gnome-doc-utils (>= 0.3.2)
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.6.2.1
 
 Package: zenity
 Architecture: any
-Depends: ${shlibs:Depends}, scrollkeeper (>= 0.3.9)
-Replaces: gnome-utils (<< 2.4.1-1)
-Conflicts: gnome-utils (<< 2.4.1-1)
+Depends: ${misc:Depends}, ${shlibs:Depends}, scrollkeeper (>= 0.3.9)
 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/patches/00_man_escape_hyphens.diff b/debian/patches/00_man_escape_hyphens.diff
index 5b52e607..c5ab143c 100644
--- a/debian/patches/00_man_escape_hyphens.diff
+++ b/debian/patches/00_man_escape_hyphens.diff
@@ -33,8 +33,8 @@
  Show the search results in a list dialog with the title \fISearch Results\fP
  and the text \fIFinding all header files...\fP.
  .IP
--find . -name '*.h' | zenity --title "Search Results" --text "Finding all header files.." --column "Files"
-+find . \-name '*.h' | zenity \-\-title "Search Results" \-\-text "Finding all header files.." \-\-column "Files"
+-find . -name '*.h' | zenity --list --title "Search Results" --text "Finding all header files.." --column "Files"
++find . \-name '*.h' | zenity \-\-list \-\-title "Search Results" \-\-text "Finding all header files.." \-\-column "Files"
  .PP
  Show an icon in the notification area
  .IP
diff --git a/debian/rules b/debian/rules
index 47f7e9a9..24c91aaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,11 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
-binary-post-install/zenity::
-	rm -rf debian/zenity/var
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
 
 clean::
 	rm -f intltool-{update,merge,extract}
diff --git a/debian/watch b/debian/watch
index 87f2fa72..620cb945 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=2
-http://ftp.gnome.org/pub/gnome/sources/zenity/([\d\.]+)/zenity-([\d\.]+)\.tar\.gz
+http://ftp.gnome.org/pub/gnome/sources/zenity/([\d\.]+)[02468]/zenity-([\d\.]+)\.tar\.gz