update to 2.10

5 files changed, 16 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index 5cb5a6f3..39cf8e6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+zenity (2.10.0-1) experimental; urgency=low
+
+  * New upstream version.
+  * debian/control.in:
+    - updated the Build-Depends.
+  * debian/patches/window-valid.diff:
+    - fixed with the new version.
+  * debian/watch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  9 Apr 2005 17:09:33 +0200
+
 zenity (2.8.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 2514996f..c33f4936 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ 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), libglade2-dev, libgnomecanvas2-dev, libxt-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>, Joe Drew <drew@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>, 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>, Takuo KITAME <kitame@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
+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>, Ed Boraas <ed@debian.org>, 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>, Joe Drew <drew@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>, 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.1.0
 
 Package: zenity
diff --git a/debian/control.in b/debian/control.in
index 8ce9ed82..41b6289c 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, intltool, scrollkeeper (>= 0.3.9), libpopt-dev, libgtk2.0-dev (>= 2.4.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.6.0), libglade2-dev, libgnomecanvas2-dev, libxt-dev
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.6.1.0
 
diff --git a/debian/patches/window-valid.diff b/debian/patches/window-valid.diff
deleted file mode 100644
index 574e6bea..00000000
--- a/debian/patches/window-valid.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- zenity-2.8.2.orig/src/util.c	2004-12-07 20:49:41.000000000 +0000
-+++ zenity-2.8.2/src/util.c	2004-12-21 10:37:52.000000000 +0000
-@@ -275,8 +275,16 @@
-   if (wid_str) {
-     char *wid_str_end;
-     Window wid = strtoul (wid_str, &wid_str_end, 10);
--    if (*wid_str != '\0' && *wid_str_end == '\0' && wid != 0)
-+    if (*wid_str != '\0' && *wid_str_end == '\0' && wid != 0) {
-+      XWindowAttributes attrs;
-+      gdk_error_trap_push ();
-+      XGetWindowAttributes (GDK_DISPLAY(), wid, &attrs);
-+      gdk_flush();
-+      if (gdk_error_trap_pop () != 0) {
-+        return None;
-+      }
-       return wid;
-+    }
-   }
-   return None;
- }
diff --git a/debian/watch b/debian/watch
index 7dffb1bf..9c96ec29 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=2
-ftp://ftp.gnome.org/pub/GNOME/sources/zenity/2.8/ \
+ftp://ftp.gnome.org/pub/GNOME/sources/zenity/2.10/ \
 	zenity-(.*)\.tar\.gz \
 	debian uupdate