Branch zenity to experimental.

4 files changed, 101 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index eb6445e4..a752913e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,72 @@
-zenity (2.18.0-2) UNRELEASED; urgency=low
+zenity (2.22.1-3) UNRELEASED; urgency=low
+
+  * Remove versioned build-dependency on scrollkeeper. Closes: #501565.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 08 Oct 2008 16:19:32 +0200
+
+zenity (2.22.1-2) unstable; urgency=low
+
+  * Conflict with libgtkada2-bin; closes: #497456.
+  * Bump up Standards-Version to 3.8.0.
+
+ -- 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.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 08 Apr 2008 05:34:21 +0200
+
+zenity (2.22.0-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * debian/control.in:
+    + Updated Standards-Version to 3.7.3, no additional changes needed.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 15 Mar 2008 11:49:06 +0100
+
+zenity (2.20.1-1) unstable; urgency=low
+
+  * New upstream bugfix release with updated translations.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 27 Nov 2007 05:42:46 +0100
+
+zenity (2.20.0-2) unstable; urgency=medium
+
+  * Drop version in dependency on scrollkeeper.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 23 Sep 2007 20:35:31 +0200
+
+zenity (2.20.0-1) unstable; urgency=low
+
+  * New upstream translation and bugfix release.
+    + Features a timeout option. Closes: #354959.
+  * 01_manpage.patch: removed, integrated upstream.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 22 Sep 2007 16:53:28 +0200
+
+zenity (2.18.2-1) unstable; urgency=low
+
+  * New upstream bugfix and translation release.
+    + correctly handle UTF-8 input text in the text info dialog
+      (closes: #410728).
+  * preinst: removed now this fix has been in a stable release
+    (closes: #213317 by obscolescence).
+  * 01_manpage.patch: manual page update from Sven Arvidsson
+    (closes: #317726).
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 03 Jun 2007 16:45:54 +0200
+
+zenity (2.18.1-1) unstable; 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.
+  * Upload to unstable; drop check-dist include.
+  * Wrap build-deps and deps.
+  * New stable release; documentation and translations.
 
- -- Loic Minier <lool@dooz.org>  Sun, 18 Mar 2007 19:59:10 +0100
+ -- Loic Minier <lool@dooz.org>  Mon, 16 Apr 2007 13:31:08 +0200
 
 zenity (2.18.0-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 3d404cea..1c7f36fd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,28 @@ Source: zenity
 Section: gnome
 Priority: optional
 Maintainer: Ross Burton <ross@debian.org>
-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
+Build-Depends: debhelper (>= 5),
+               cdbs (>= 0.4.4),
+               gnome-pkg-tools (>= 0.10),
+               intltool (>= 0.35.0),
+               scrollkeeper,
+               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>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
+Standards-Version: 3.8.0
 
 Package: zenity
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, scrollkeeper (>= 0.3.9)
+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 056b16cc..8ffd5802 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,13 +2,28 @@ Source: zenity
 Section: gnome
 Priority: optional
 Maintainer: Ross Burton <ross@debian.org>
-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
+Build-Depends: debhelper (>= 5),
+               cdbs (>= 0.4.4),
+               gnome-pkg-tools (>= 0.10),
+               intltool (>= 0.35.0),
+               scrollkeeper,
+               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.7.2
+Standards-Version: 3.8.0
 
 Package: zenity
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, scrollkeeper (>= 0.3.9)
+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/rules b/debian/rules
index 1d745560..dfc04e5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@ 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