From 0febfb568a849f9176b8c5b96f112fc008316c31 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Thu, 5 Mar 2009 10:08:46 +0000 Subject: * New upstream translation and bugfix release. * Bump build-dependency on intltool. --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e0996ac0..dababe0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zenity (2.24.1-1) unstable; urgency=low + + * New upstream translation and bugfix release. + * Bump build-dependency on intltool. + + -- Josselin Mouette 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..bf5919e2 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Ross Burton Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), - intltool (>= 0.35.0), + intltool (>= 0.40.0), scrollkeeper, libgtk2.0-dev (>= 2.9.2), libglade2-dev, diff --git a/debian/control.in b/debian/control.in index 9b647c0f..3149c949 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,7 +5,7 @@ Maintainer: Ross Burton Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), - intltool (>= 0.35.0), + intltool (>= 0.40.0), scrollkeeper, libgtk2.0-dev (>= 2.9.2), libglade2-dev, -- cgit From c5deec5a3372a2c20510faf6da89a781f401758b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 26 Apr 2009 21:45:38 +0000 Subject: * 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. --- debian/changelog | 13 +++++++++++++ debian/control | 5 ++--- debian/control.in | 5 ++--- debian/copyright | 36 +++++++++++++++++++++++------------- 4 files changed, 40 insertions(+), 19 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dababe0c..5f36fbb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +zenity (2.26.0-1) UNRELEASED; urgency=low + + * 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. + + -- Luca Bruno Sun, 26 Apr 2009 22:59:50 +0200 + zenity (2.24.1-1) unstable; urgency=low * New upstream translation and bugfix release. diff --git a/debian/control b/debian/control index bf5919e2..2db800b3 100644 --- a/debian/control +++ b/debian/control @@ -7,14 +7,13 @@ Build-Depends: debhelper (>= 5), gnome-pkg-tools (>= 0.10), intltool (>= 0.40.0), scrollkeeper, - libgtk2.0-dev (>= 2.9.2), + libgtk2.0-dev (>= 2.15.1), libglade2-dev, - libgnomecanvas2-dev, gnome-doc-utils (>= 0.3.2), libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10 Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Package: zenity Architecture: any diff --git a/debian/control.in b/debian/control.in index 3149c949..18077b36 100644 --- a/debian/control.in +++ b/debian/control.in @@ -7,14 +7,13 @@ Build-Depends: debhelper (>= 5), gnome-pkg-tools (>= 0.10), intltool (>= 0.40.0), scrollkeeper, - libgtk2.0-dev (>= 2.9.2), + libgtk2.0-dev (>= 2.15.1), libglade2-dev, - libgnomecanvas2-dev, gnome-doc-utils (>= 0.3.2), libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10 Uploaders: @GNOME_TEAM@ -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Package: zenity Architecture: any diff --git a/debian/copyright b/debian/copyright index 20916a7e..d10ebc0f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,22 +3,32 @@ Sat, 1 Feb 2003 15:46:03 +0000. It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/zenity/ -Upstream Author: Glynn Foster +Upstream Authors: + Glynn Foster + Mike Newman + Lucas Rocha Copyright: + Copyright (C) 2002-2005 Sun Microsystems, Inc. + Copyright (C) 2003 Mike Newman + Copyright (C) 2005-2009 Lucas Rocha - 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'. -- cgit From 9b74f2ffa147ca9124e8ab0c143e68c508643bdd Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 12 May 2009 09:35:22 +0000 Subject: Remove scrollkeeper dependencies. --- debian/changelog | 4 ++++ debian/control | 3 +-- debian/control.in | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5f36fbb5..5cd4825e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ zenity (2.26.0-1) UNRELEASED; urgency=low + [ Luca Bruno ] * New upstream release. * debian/control.in: - Remove libgnomecanvas2-dev dependency. @@ -9,6 +10,9 @@ zenity (2.26.0-1) UNRELEASED; urgency=low - Change license to LGPL-2. - Add two more upstream authors and copyright notices. + [ Josselin Mouette ] + * Remove scrollkeeper dependency. + -- Luca Bruno Sun, 26 Apr 2009 22:59:50 +0200 zenity (2.24.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 2db800b3..1be30947 100644 --- a/debian/control +++ b/debian/control @@ -18,8 +18,7 @@ Standards-Version: 3.8.1 Package: zenity Architecture: any Depends: ${misc:Depends}, - ${shlibs:Depends}, - scrollkeeper + ${shlibs:Depends} Conflicts: libgtkada2-bin Description: Display graphical dialog boxes from shell scripts Zenity allows you to display GTK+ dialogs from shell scripts; it is a diff --git a/debian/control.in b/debian/control.in index 18077b36..c5407f30 100644 --- a/debian/control.in +++ b/debian/control.in @@ -18,8 +18,7 @@ Standards-Version: 3.8.1 Package: zenity Architecture: any Depends: ${misc:Depends}, - ${shlibs:Depends}, - scrollkeeper + ${shlibs:Depends} Conflicts: libgtkada2-bin Description: Display graphical dialog boxes from shell scripts Zenity allows you to display GTK+ dialogs from shell scripts; it is a -- cgit From c3e05a453cda232723a0abdae2b6aac415922a7a Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 9 Jun 2009 17:13:41 +0000 Subject: Upload to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5cd4825e..e8d26ade 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -zenity (2.26.0-1) UNRELEASED; urgency=low +zenity (2.26.0-1) unstable; urgency=low [ Luca Bruno ] * New upstream release. @@ -13,7 +13,7 @@ zenity (2.26.0-1) UNRELEASED; urgency=low [ Josselin Mouette ] * Remove scrollkeeper dependency. - -- Luca Bruno Sun, 26 Apr 2009 22:59:50 +0200 + -- Josselin Mouette Tue, 09 Jun 2009 19:11:14 +0200 zenity (2.24.1-1) unstable; urgency=low -- cgit From 68ed09c2dcf927da6a2d3ab84980a00bc997cd96 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sun, 21 Jun 2009 08:42:06 +0000 Subject: Only conflict with libgtkada-bin << 2.12.0-4, add replaces. Closes: #533867. --- debian/changelog | 7 +++++++ debian/control | 3 ++- debian/control.in | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e8d26ade..c5e6e3bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zenity (2.26.0-2) UNRELEASED; urgency=low + + * Only conflict with libgtkada-bin << 2.12.0-4, add replaces. + Closes: #533867. + + -- Josselin Mouette Sun, 21 Jun 2009 10:41:27 +0200 + zenity (2.26.0-1) unstable; urgency=low [ Luca Bruno ] diff --git a/debian/control b/debian/control index 1be30947..d28f6e7c 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,8 @@ Package: zenity Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Conflicts: libgtkada2-bin +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 c5407f30..ac7ea9d5 100644 --- a/debian/control.in +++ b/debian/control.in @@ -19,7 +19,8 @@ Package: zenity Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Conflicts: libgtkada2-bin +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. -- cgit From fc21883ff4129a4db7366403accb63241a146c49 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 18 Aug 2009 16:23:12 +0000 Subject: 01_focus_windows.patch: stolen upstream. Focus zenity windows by default. Closes: #528455. --- debian/changelog | 6 +- debian/patches/01_focus_windows.patch | 105 ++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 debian/patches/01_focus_windows.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c5e6e3bb..b2a4fbcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -zenity (2.26.0-2) UNRELEASED; urgency=low +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 Sun, 21 Jun 2009 10:41:27 +0200 + -- Josselin Mouette Tue, 18 Aug 2009 18:23:10 +0200 zenity (2.26.0-1) unstable; urgency=low diff --git a/debian/patches/01_focus_windows.patch b/debian/patches/01_focus_windows.patch new file mode 100644 index 00000000..9157f5c5 --- /dev/null +++ b/debian/patches/01_focus_windows.patch @@ -0,0 +1,105 @@ +Debian #528455 +GNOME #561131 + +From b87f233061134f8876803d150f1d1196d2d41561 Mon Sep 17 00:00:00 2001 +From: Lucas Rocha +Date: Thu, 06 Aug 2009 14:42:04 +0000 +Subject: Bug 561131 – zenity windows don't appear with the focus + +--- +diff --git a/src/zenity.ui b/src/zenity.ui +index db30432..5275a07 100644 +--- a/src/zenity.ui ++++ b/src/zenity.ui +@@ -7,7 +7,7 @@ + Calendar selection + center + dialog +- False ++ True + False + + +@@ -129,7 +129,7 @@ + Warning + center + dialog +- False ++ True + False + + +@@ -213,7 +213,7 @@ + Question + center + dialog +- False ++ True + False + + +@@ -278,7 +278,7 @@ + Add a new entry + center + dialog +- False ++ True + False + + +@@ -377,7 +377,7 @@ + 300 + 200 + dialog +- False ++ True + False + + +@@ -455,7 +455,7 @@ + Progress + center + dialog +- False ++ True + False + + +@@ -551,7 +551,7 @@ + Error + center + dialog +- False ++ True + False + + +@@ -643,7 +643,7 @@ + 300 + 196 + dialog +- False ++ True + False + + +@@ -744,7 +744,7 @@ + Information + center + dialog +- False ++ True + False + + +@@ -827,7 +827,7 @@ + 300 + 100 + dialog +- False ++ True + False + + +-- +cgit v0.8.2 -- cgit From bb190a168b401b1a79d2f94c717119adc3a5fa5d Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 18 Aug 2009 16:26:42 +0000 Subject: Backport patch for 2.26 which still uses glade --- debian/patches/01_focus_windows.patch | 195 ++++++++++++++++------------------ 1 file changed, 93 insertions(+), 102 deletions(-) (limited to 'debian') diff --git a/debian/patches/01_focus_windows.patch b/debian/patches/01_focus_windows.patch index 9157f5c5..df8c6fd9 100644 --- a/debian/patches/01_focus_windows.patch +++ b/debian/patches/01_focus_windows.patch @@ -1,105 +1,96 @@ Debian #528455 GNOME #561131 +zenity windows don't appear with the focus -From b87f233061134f8876803d150f1d1196d2d41561 Mon Sep 17 00:00:00 2001 -From: Lucas Rocha -Date: Thu, 06 Aug 2009 14:42:04 +0000 -Subject: Bug 561131 – zenity windows don't appear with the focus - ---- -diff --git a/src/zenity.ui b/src/zenity.ui -index db30432..5275a07 100644 ---- a/src/zenity.ui -+++ b/src/zenity.ui -@@ -7,7 +7,7 @@ - Calendar selection - center - dialog -- False -+ True - False - - -@@ -129,7 +129,7 @@ - Warning - center - dialog -- False -+ True - False - - -@@ -213,7 +213,7 @@ - Question - center - dialog -- False -+ True - False - - -@@ -278,7 +278,7 @@ - Add a new entry - center - dialog -- False -+ True - False - - -@@ -377,7 +377,7 @@ - 300 - 200 - dialog -- False -+ True - False - - -@@ -455,7 +455,7 @@ - Progress - center - dialog -- False -+ True - False - - -@@ -551,7 +551,7 @@ - Error - center - dialog -- False -+ True - False - - -@@ -643,7 +643,7 @@ - 300 - 196 - dialog -- False -+ True - False - - -@@ -744,7 +744,7 @@ - Information - center - dialog -- False -+ True - False - - -@@ -827,7 +827,7 @@ - 300 - 100 - dialog -- False -+ True - False - - --- -cgit v0.8.2 +--- src/zenity.glade.orig 2009-08-18 18:24:11.718036836 +0200 ++++ src/zenity.glade 2009-08-18 18:25:45.013694578 +0200 +@@ -16,7 +16,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -177,7 +177,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -288,7 +288,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -385,7 +385,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -510,7 +510,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -613,7 +613,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -736,7 +736,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -862,7 +862,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -998,7 +998,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -1111,7 +1111,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + -- cgit From c137b795849bc9fcfb20cdb479aacc652e70e6b0 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Thu, 24 Sep 2009 18:04:48 +0000 Subject: * 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. --- debian/changelog | 18 +++++++ debian/control | 6 +-- debian/control.in | 6 +-- debian/copyright | 5 ++ debian/patches/01_focus_windows.patch | 96 ----------------------------------- debian/rules | 1 - 6 files changed, 29 insertions(+), 103 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b2a4fbcd..85edfda4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +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 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. diff --git a/debian/control b/debian/control index d28f6e7c..16ec241d 100644 --- a/debian/control +++ b/debian/control @@ -8,12 +8,12 @@ Build-Depends: debhelper (>= 5), intltool (>= 0.40.0), scrollkeeper, libgtk2.0-dev (>= 2.15.1), - libglade2-dev, gnome-doc-utils (>= 0.3.2), libnotify-dev (>= 0.4.3-2), - libnotify-dev-gtk2.10 + libnotify-dev-gtk2.10, + libglib2.0-dev Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge -Standards-Version: 3.8.1 +Standards-Version: 3.8.3 Package: zenity Architecture: any diff --git a/debian/control.in b/debian/control.in index ac7ea9d5..c4e52cad 100644 --- a/debian/control.in +++ b/debian/control.in @@ -8,12 +8,12 @@ Build-Depends: debhelper (>= 5), intltool (>= 0.40.0), scrollkeeper, libgtk2.0-dev (>= 2.15.1), - libglade2-dev, gnome-doc-utils (>= 0.3.2), libnotify-dev (>= 0.4.3-2), - libnotify-dev-gtk2.10 + libnotify-dev-gtk2.10, + libglib2.0-dev Uploaders: @GNOME_TEAM@ -Standards-Version: 3.8.1 +Standards-Version: 3.8.3 Package: zenity Architecture: any diff --git a/debian/copyright b/debian/copyright index d10ebc0f..bf424387 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,6 +12,11 @@ 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 License: diff --git a/debian/patches/01_focus_windows.patch b/debian/patches/01_focus_windows.patch index df8c6fd9..e69de29b 100644 --- a/debian/patches/01_focus_windows.patch +++ b/debian/patches/01_focus_windows.patch @@ -1,96 +0,0 @@ -Debian #528455 -GNOME #561131 -zenity windows don't appear with the focus - ---- src/zenity.glade.orig 2009-08-18 18:24:11.718036836 +0200 -+++ src/zenity.glade 2009-08-18 18:25:45.013694578 +0200 -@@ -16,7 +16,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -177,7 +177,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -288,7 +288,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -385,7 +385,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -510,7 +510,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -613,7 +613,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -736,7 +736,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -862,7 +862,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -998,7 +998,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -1111,7 +1111,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - diff --git a/debian/rules b/debian/rules index 3d35a594..969dd4a3 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,6 @@ 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/gnome-get-source.mk -- cgit From 78b486952bb398250fb923569f9d455692fcdf38 Mon Sep 17 00:00:00 2001 From: Andrea Veri Date: Thu, 5 Nov 2009 23:21:22 +0000 Subject: * debian/control.in: - really don't B-D on scrollkeeper anymore. --- debian/changelog | 7 +++++++ debian/control | 3 +-- debian/control.in | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 85edfda4..9f773d9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zenity (2.28.0-2) UNRELEASED; urgency=low + + * debian/control.in: + - really don't B-D on scrollkeeper anymore. + + -- Andrea Veri Fri, 06 Nov 2009 00:20:01 +0100 + zenity (2.28.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 16ec241d..9922dd12 100644 --- a/debian/control +++ b/debian/control @@ -6,13 +6,12 @@ Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), intltool (>= 0.40.0), - scrollkeeper, libgtk2.0-dev (>= 2.15.1), gnome-doc-utils (>= 0.3.2), libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10, libglib2.0-dev -Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge +Uploaders: Andrea Veri , Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge Standards-Version: 3.8.3 Package: zenity diff --git a/debian/control.in b/debian/control.in index c4e52cad..7cca2180 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,7 +6,6 @@ Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), intltool (>= 0.40.0), - scrollkeeper, libgtk2.0-dev (>= 2.15.1), gnome-doc-utils (>= 0.3.2), libnotify-dev (>= 0.4.3-2), -- cgit From 8a1a2ef0857c8afd7076e176693bb5757e63f11c Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sat, 27 Feb 2010 14:41:57 +0000 Subject: * debian/patches/02_dont_quit_zenity_when_stdin_ends.patch: - Don't quit zenity when listening on stdin and the stream ends. Closes: #506425. --- debian/changelog | 6 +++++ .../02_dont_quit_zenity_when_stdin_ends.patch | 30 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 debian/patches/02_dont_quit_zenity_when_stdin_ends.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9f773d9d..aa87e094 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ zenity (2.28.0-2) UNRELEASED; urgency=low + [ Andrea Veri ] * debian/control.in: - really don't B-D on scrollkeeper anymore. + [ Emilio Pozuelo Monfort ] + * debian/patches/02_dont_quit_zenity_when_stdin_ends.patch: + - Don't quit zenity when listening on stdin and the stream ends. + Closes: #506425. + -- Andrea Veri Fri, 06 Nov 2009 00:20:01 +0100 zenity (2.28.0-1) unstable; urgency=low diff --git a/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch b/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch new file mode 100644 index 00000000..3310189a --- /dev/null +++ b/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch @@ -0,0 +1,30 @@ +From fc381b5938f7235401286d4821f03d2b05d4876a Mon Sep 17 00:00:00 2001 +From: Emilio Pozuelo Monfort +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 + -- cgit From b42194170157ec8a142145ac0316a84e722efc47 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sat, 27 Feb 2010 16:05:20 +0000 Subject: * debian/control.in: - Standards-Version is 3.8.4, no changes needed. - Move Uploaders right after Maintainer. --- debian/changelog | 7 +++++-- debian/control | 9 +++++++-- debian/control.in | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aa87e094..3c536173 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -zenity (2.28.0-2) UNRELEASED; urgency=low +zenity (2.28.0-2) unstable; urgency=low [ Andrea Veri ] * debian/control.in: @@ -8,8 +8,11 @@ zenity (2.28.0-2) UNRELEASED; urgency=low * debian/patches/02_dont_quit_zenity_when_stdin_ends.patch: - Don't quit zenity when listening on stdin and the stream ends. Closes: #506425. + * debian/control.in: + - Standards-Version is 3.8.4, no changes needed. + - Move Uploaders right after Maintainer. - -- Andrea Veri Fri, 06 Nov 2009 00:20:01 +0100 + -- Emilio Pozuelo Monfort Sat, 27 Feb 2010 16:42:27 +0100 zenity (2.28.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 9922dd12..b87d6a1a 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,13 @@ +# 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 +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Loic Minier , Sebastian Dröge Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), @@ -11,8 +17,7 @@ Build-Depends: debhelper (>= 5), libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10, libglib2.0-dev -Uploaders: Andrea Veri , Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Package: zenity Architecture: any diff --git a/debian/control.in b/debian/control.in index 7cca2180..b69ab6a9 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,6 +2,7 @@ Source: zenity Section: gnome Priority: optional Maintainer: Ross Burton +Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), @@ -11,8 +12,7 @@ Build-Depends: debhelper (>= 5), libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10, libglib2.0-dev -Uploaders: @GNOME_TEAM@ -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Package: zenity Architecture: any -- cgit From 0e82248225dd2ba5c8f148cbfd4789d94d8a68ca Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sat, 27 Feb 2010 16:11:07 +0000 Subject: * debian/patches/01_focus_windows.patch: - Removed, it's empty. * debian/patches/01_dont_quit_zenity_when_stdin_ends.patch: * debian/rules: - Include simple-patchsys.mk. --- debian/changelog | 6 ++++- .../01_dont_quit_zenity_when_stdin_ends.patch | 30 ++++++++++++++++++++++ debian/patches/01_focus_windows.patch | 0 .../02_dont_quit_zenity_when_stdin_ends.patch | 30 ---------------------- debian/rules | 1 + 5 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 debian/patches/01_dont_quit_zenity_when_stdin_ends.patch delete mode 100644 debian/patches/01_focus_windows.patch delete mode 100644 debian/patches/02_dont_quit_zenity_when_stdin_ends.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3c536173..8fded342 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,9 +5,13 @@ zenity (2.28.0-2) unstable; urgency=low - really don't B-D on scrollkeeper anymore. [ Emilio Pozuelo Monfort ] - * debian/patches/02_dont_quit_zenity_when_stdin_ends.patch: + * 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. 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 +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 + diff --git a/debian/patches/01_focus_windows.patch b/debian/patches/01_focus_windows.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch b/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch deleted file mode 100644 index 3310189a..00000000 --- a/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fc381b5938f7235401286d4821f03d2b05d4876a Mon Sep 17 00:00:00 2001 -From: Emilio Pozuelo Monfort -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 - diff --git a/debian/rules b/debian/rules index 969dd4a3..3d35a594 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ 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/gnome-get-source.mk -- cgit From d4e29a8ad676e393f8a71fa3d882f630b90026fc Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sat, 27 Feb 2010 17:29:50 +0000 Subject: * debian/docs: - Removed, NEWS and README are installed automatically. --- debian/changelog | 2 ++ debian/docs | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 debian/docs (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8fded342..2ca6eff7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ zenity (2.28.0-2) unstable; urgency=low * debian/control.in: - Standards-Version is 3.8.4, no changes needed. - Move Uploaders right after Maintainer. + * debian/docs: + - Removed, NEWS and README are installed automatically. -- Emilio Pozuelo Monfort Sat, 27 Feb 2010 16:42:27 +0100 diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 50bd824b..00000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -NEWS -README -- cgit From b291699da8416f9028a8f5ce826bf9076cc4c51b Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sat, 27 Feb 2010 18:15:21 +0000 Subject: Build depend on docbook-xml, needed to build the documentation. --- debian/changelog | 1 + debian/control | 3 ++- debian/control.in | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2ca6eff7..cf51b16f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ zenity (2.28.0-2) unstable; urgency=low * 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. diff --git a/debian/control b/debian/control index b87d6a1a..83dab63b 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,8 @@ Build-Depends: debhelper (>= 5), gnome-doc-utils (>= 0.3.2), libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10, - libglib2.0-dev + libglib2.0-dev, + docbook-xml Standards-Version: 3.8.4 Package: zenity diff --git a/debian/control.in b/debian/control.in index b69ab6a9..8eb900f4 100644 --- a/debian/control.in +++ b/debian/control.in @@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 5), gnome-doc-utils (>= 0.3.2), libnotify-dev (>= 0.4.3-2), libnotify-dev-gtk2.10, - libglib2.0-dev + libglib2.0-dev, + docbook-xml Standards-Version: 3.8.4 Package: zenity -- cgit From 4b968783ad8a8bc1bf633a7ae6ec8e849eea67a3 Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Sun, 4 Apr 2010 18:22:54 +0000 Subject: New upstream release --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cf51b16f..33d2e402 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zenity (2.30.0-1) unstable; urgency=low + + * New upstream release. + + -- Luca Falavigna Sun, 04 Apr 2010 20:16:35 +0200 + zenity (2.28.0-2) unstable; urgency=low [ Andrea Veri ] diff --git a/debian/control b/debian/control index 83dab63b..43f0a428 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Source: zenity Section: gnome Priority: optional Maintainer: Ross Burton -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Loic Minier , Sebastian Dröge +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Loic Minier , Luca Falavigna , Sebastian Dröge Build-Depends: debhelper (>= 5), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), -- cgit