diff options
author | Laurent Bigonville <bigon@debian.org> | 2011-02-07 01:02:48 +0000 |
---|---|---|
committer | Laurent Bigonville <bigon@debian.org> | 2011-02-07 01:02:48 +0000 |
commit | 65f188d3cb61a32eb5b4a02f85ec1fb01982d277 (patch) | |
tree | 084c55b65d7b4676c2a2b480927dcde5e6c89fcd | |
parent | * New upstream release. (diff) | |
parent | New upstream release (diff) | |
download | zenity-65f188d3cb61a32eb5b4a02f85ec1fb01982d277.tar.gz zenity-65f188d3cb61a32eb5b4a02f85ec1fb01982d277.tar.bz2 zenity-65f188d3cb61a32eb5b4a02f85ec1fb01982d277.zip |
Branch to experimental
-rw-r--r-- | debian/changelog | 80 | ||||
-rw-r--r-- | debian/control | 26 | ||||
-rw-r--r-- | debian/control.in | 21 | ||||
-rw-r--r-- | debian/copyright | 41 | ||||
-rw-r--r-- | debian/patches/01_dont_quit_zenity_when_stdin_ends.patch | 30 |
5 files changed, 163 insertions, 35 deletions
diff --git a/debian/changelog b/debian/changelog index e0996ac0..33d2e402 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,83 @@ +zenity (2.30.0-1) unstable; urgency=low + + * New upstream release. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 04 Apr 2010 20:16:35 +0200 + +zenity (2.28.0-2) unstable; urgency=low + + [ Andrea Veri ] + * debian/control.in: + - really don't B-D on scrollkeeper anymore. + + [ Emilio Pozuelo Monfort ] + * debian/patches/01_focus_windows.patch: + - Removed, it's empty. + * debian/patches/01_dont_quit_zenity_when_stdin_ends.patch: + - Don't quit zenity when listening on stdin and the stream ends. + Closes: #506425. + * debian/rules: + - Include simple-patchsys.mk. + * debian/control.in: + - Standards-Version is 3.8.4, no changes needed. + - Move Uploaders right after Maintainer. + - Build depend on docbook-xml, needed to build the documentation. + * debian/docs: + - Removed, NEWS and README are installed automatically. + + -- Emilio Pozuelo Monfort <pochu@debian.org> Sat, 27 Feb 2010 16:42:27 +0100 + +zenity (2.28.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Bumped standards-version to 3.8.3. No changes needed. + - libglade2-dev B-D removed, it's no more needed as per + configure.ac requirements. + - libglib2.0-dev B-D added as per configure.ac requirements. + * debian/copyright: + - added missing copyright holders. + * debian/patches/01_focus_windows: + - removed, applied upstream + * debian/rules: + - simple-patchsys include removed as far as we have no + patches to get applied anymore. + + -- Andrea Veri <andrea.veri89@gmail.com> Thu, 24 Sep 2009 18:47:12 +0200 + +zenity (2.26.0-2) unstable; urgency=low + + * Only conflict with libgtkada-bin << 2.12.0-4, add replaces. + Closes: #533867. + * 01_focus_windows.patch: stolen upstream. Focus zenity windows by + default. Closes: #528455. + + -- Josselin Mouette <joss@debian.org> Tue, 18 Aug 2009 18:23:10 +0200 + +zenity (2.26.0-1) unstable; urgency=low + + [ Luca Bruno ] + * New upstream release. + * debian/control.in: + - Remove libgnomecanvas2-dev dependency. + - Bump up Standards-Version to 3.8.1, no changes needed. + - Bump libgtk2.0-dev to 2.15.1. + * debian/copyright: + - Change license to LGPL-2. + - Add two more upstream authors and copyright notices. + + [ Josselin Mouette ] + * Remove scrollkeeper dependency. + + -- Josselin Mouette <joss@debian.org> Tue, 09 Jun 2009 19:11:14 +0200 + +zenity (2.24.1-1) unstable; urgency=low + + * New upstream translation and bugfix release. + * Bump build-dependency on intltool. + + -- Josselin Mouette <joss@debian.org> Thu, 05 Mar 2009 11:06:59 +0100 + zenity (2.24.0-1) experimental; urgency=low * Remove versioned build-dependency on scrollkeeper. Closes: #501565. diff --git a/debian/control b/debian/control index 60fe0908..43f0a428 100644 --- a/debian/control +++ b/debian/control @@ -1,27 +1,31 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + Source: zenity Section: gnome Priority: optional Maintainer: Ross Burton <ross@debian.org> +Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Luca Falavigna <dktrkranz@debian.org>, Sebastian Dröge <slomo@debian.org> Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), - intltool (>= 0.35.0), - scrollkeeper, - libgtk2.0-dev (>= 2.9.2), - libglade2-dev, - libgnomecanvas2-dev, + intltool (>= 0.40.0), + libgtk2.0-dev (>= 2.15.1), 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 + libnotify-dev-gtk2.10, + libglib2.0-dev, + docbook-xml +Standards-Version: 3.8.4 Package: zenity Architecture: any Depends: ${misc:Depends}, - ${shlibs:Depends}, - scrollkeeper -Conflicts: libgtkada2-bin + ${shlibs:Depends} +Conflicts: libgtkada2-bin (<< 2.12.0-4) +Replaces: libgtkada2-bin (<< 2.12.0-4) 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 9b647c0f..8eb900f4 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,26 +2,25 @@ Source: zenity Section: gnome Priority: optional Maintainer: Ross Burton <ross@debian.org> +Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), - intltool (>= 0.35.0), - scrollkeeper, - libgtk2.0-dev (>= 2.9.2), - libglade2-dev, - libgnomecanvas2-dev, + intltool (>= 0.40.0), + libgtk2.0-dev (>= 2.15.1), gnome-doc-utils (>= 0.3.2), libnotify-dev (>= 0.4.3-2), - libnotify-dev-gtk2.10 -Uploaders: @GNOME_TEAM@ -Standards-Version: 3.8.0 + libnotify-dev-gtk2.10, + libglib2.0-dev, + docbook-xml +Standards-Version: 3.8.4 Package: zenity Architecture: any Depends: ${misc:Depends}, - ${shlibs:Depends}, - scrollkeeper -Conflicts: libgtkada2-bin + ${shlibs:Depends} +Conflicts: libgtkada2-bin (<< 2.12.0-4) +Replaces: libgtkada2-bin (<< 2.12.0-4) 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/copyright b/debian/copyright index 20916a7e..bf424387 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,22 +3,37 @@ Sat, 1 Feb 2003 15:46:03 +0000. It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/zenity/ -Upstream Author: Glynn Foster <glynn.foster@sun.com> +Upstream Authors: + Glynn Foster <glynn.foster@sun.com> + Mike Newman <mikegtn@gnome.org> + Lucas Rocha <lucasr@cvs.gnome.org> Copyright: + Copyright (C) 2002-2005 Sun Microsystems, Inc. + Copyright (C) 2003 Mike Newman + Copyright (C) 2005-2009 Lucas Rocha + Copyright (C) 1999, 2000 Red Hat Inc + Copyright (C) 1998 James Henstridge + Copyright (C) 2006 Christian Persch + Copyright (C) 2001 CodeFactory AB + Copyright (C) 2001, 2002 Anders Carlsson - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 dated June, 1991. +License: - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-2'. diff --git a/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch b/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch new file mode 100644 index 00000000..3310189a --- /dev/null +++ b/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch @@ -0,0 +1,30 @@ +From fc381b5938f7235401286d4821f03d2b05d4876a Mon Sep 17 00:00:00 2001 +From: Emilio Pozuelo Monfort <pochu27@gmail.com> +Date: Sat, 27 Feb 2010 15:32:23 +0100 +Subject: [PATCH] Don't quit zenity when the input stream is closed + +When using --listen for a notification, zenity quits when the stream +ends. This makes it impossible to read commands from a pipe as in +`echo icon:info | zenity --notification --listen'. + +https://bugzilla.gnome.org/show_bug.cgi?id=525596 +--- + src/notification.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/notification.c b/src/notification.c +index 674eaec..ab44477 100644 +--- a/src/notification.c ++++ b/src/notification.c +@@ -229,8 +229,6 @@ zenity_notification_handle_stdin (GIOChannel *channel, + + if ((condition & G_IO_HUP) != 0) { + g_io_channel_shutdown (channel, TRUE, NULL); +- zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK); +- gtk_main_quit (); + return FALSE; + } + +-- +1.7.0 + |