* Move experimental branch of zenity to unstable.

5 files changed, 65 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 28fbde0e..eb6445e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,59 @@
+zenity (2.18.0-2) UNRELEASED; urgency=low
+
+  * Finish merging 2.14.3-2; SVN r8332:9108.
+  * Don't override DEB_CONFIGURE_EXTRA_FLAGS.
+  * Bump up Debhelper compatibility level to 5.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 18 Mar 2007 19:59:10 +0100
+
+zenity (2.18.0-1) experimental; urgency=low
+
+  * New upstream major stable release; fixes and translations.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 17 Mar 2007 11:05:34 +0100
+
+zenity (2.16.3-1) experimental; urgency=low
+
+  * Build-depend on libnotify-dev-gtk2.10 since zenity relies on libnotify API
+    specific to Gtk 2.10.
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * Include the new check-dist Makefile to prevent accidental uploads to
+    unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+  * New upstream stable release; translations.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 17 Mar 2007 10:52:06 +0100
+
+zenity (2.16.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Build-depend on libnotify 0.4.3-2.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 21 Dec 2006 18:52:04 +0100
+
+zenity (2.16.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Guilherme de S. Pastore <gpastore@debian.org>  Mon,  2 Oct 2006 16:56:16 -0300
+
+zenity (2.16.0-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * New upstream release.
+  * 01_manpage_fix.patch: removed, integrated upstream.
+  * Standards version is 3.7.2.
+  * Bump intltool and gtk+ requirements.
+  * Remove build-dependency on libpopt.
+  * Build-depend on libnotify-dev.
+
+  [ Loic Minier ]
+  * This upstream release switches COPYING from LGPL to GPL by mistake, but
+    the headers still point to the LGPL.
+  * Bump up the libnotify-dev build-dep to >= 0.4.2-2 which was rebuilt with
+    gtkstatusicon support.
+
+ -- Loic Minier <lool@dooz.org>  Fri, 22 Sep 2006 12:32:09 +0200
+
 zenity (2.14.3-2) unstable; urgency=low
 
   * Fix bashism.
diff --git a/debian/compat b/debian/compat
index b8626c4c..7ed6ff82 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 4aa0413c..3d404cea 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ 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.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>, Clément Stenac <zorglub@debian.org>, Dafydd Harries <daf@debian.org>, Ed Boraas <ed@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
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), intltool (>= 0.35.0), scrollkeeper (>= 0.3.9), libgtk2.0-dev (>= 2.9.2), libglib2.0-dev (>= 2.7.3), libglade2-dev, libgnomecanvas2-dev, libxt-dev, 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>, Andrew Lau <netsnipe@users.sourceforge.net>, Clément Stenac <zorglub@debian.org>, Dafydd Harries <daf@debian.org>, Guilherme de S. Pastore <gpastore@debian.org>, Gustavo Franco <stratus@debian.org>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Kilian Krause <kilian@debian.org>, Loic Minier <lool@dooz.org>, Marc 'HE' Brockschmidt <he@debian.org>, Marco Cabizza <marco87@gmail.com>, Oystein Gisnas <oystein@gisnas.net>, Ondřej Surý <ondrej@debian.org>, Sebastien Bacher <seb128@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Standards-Version: 3.7.2
 
 Package: zenity
 Architecture: any
diff --git a/debian/control.in b/debian/control.in
index 84366d72..056b16cc 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,9 +2,9 @@ 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.7.3), libglade2-dev, libgnomecanvas2-dev, libxt-dev, gnome-doc-utils (>= 0.3.2)
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), intltool (>= 0.35.0), scrollkeeper (>= 0.3.9), libgtk2.0-dev (>= 2.9.2), libglib2.0-dev (>= 2.7.3), libglade2-dev, libgnomecanvas2-dev, libxt-dev, gnome-doc-utils (>= 0.3.2), libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.6.2.1
+Standards-Version: 3.7.2
 
 Package: zenity
 Architecture: any
diff --git a/debian/rules b/debian/rules
index b599c774..1d745560 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,14 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
 
 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
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 
 clean::
 	rm -f intltool-extract intltool-merge intltool-update