summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <pochu@debian.org>2009-09-24 18:04:48 +0000
committerEmilio Pozuelo Monfort <pochu@debian.org>2009-09-24 18:04:48 +0000
commitc137b795849bc9fcfb20cdb479aacc652e70e6b0 (patch)
tree0959d7432b3a13a227497e332deb00361459cb6a
parentBackport patch for 2.26 which still uses glade (diff)
downloadzenity-c137b795849bc9fcfb20cdb479aacc652e70e6b0.tar.gz
zenity-c137b795849bc9fcfb20cdb479aacc652e70e6b0.tar.bz2
zenity-c137b795849bc9fcfb20cdb479aacc652e70e6b0.zip
* 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.
-rw-r--r--debian/changelog18
-rw-r--r--debian/control6
-rw-r--r--debian/control.in6
-rw-r--r--debian/copyright5
-rw-r--r--debian/patches/01_focus_windows.patch96
-rwxr-xr-xdebian/rules1
6 files changed, 29 insertions, 103 deletions
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 <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.
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 <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.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 @@
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-- <property name="focus_on_map">False</property>
-+ <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
- <signal name="destroy" handler="gtk_main_quit" last_modification_time="Fri, 27 Dec 2002 19:08:11 GMT"/>
-@@ -177,7 +177,7 @@
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-- <property name="focus_on_map">False</property>
-+ <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
- <signal name="destroy" handler="gtk_main_quit" last_modification_time="Fri, 27 Dec 2002 23:24:20 GMT"/>
-@@ -288,7 +288,7 @@
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-- <property name="focus_on_map">False</property>
-+ <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
- <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:03:54 GMT"/>
-@@ -385,7 +385,7 @@
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-- <property name="focus_on_map">False</property>
-+ <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
- <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:15:37 GMT"/>
-@@ -510,7 +510,7 @@
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-- <property name="focus_on_map">False</property>
-+ <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
- <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:34:38 GMT"/>
-@@ -613,7 +613,7 @@
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-- <property name="focus_on_map">False</property>
-+ <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
- <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 14:46:29 GMT"/>
-@@ -736,7 +736,7 @@
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-- <property name="focus_on_map">False</property>
-+ <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
- <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 15:05:42 GMT"/>
-@@ -862,7 +862,7 @@
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-- <property name="focus_on_map">False</property>
-+ <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
- <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 22:19:04 GMT"/>
-@@ -998,7 +998,7 @@
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-- <property name="focus_on_map">False</property>
-+ <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
- <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 15:05:42 GMT"/>
-@@ -1111,7 +1111,7 @@
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-- <property name="focus_on_map">False</property>
-+ <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
- <signal name="destroy" handler="gtk_main_quit" last_modification_time="Tue, 13 Dec 2005 04:03:21 GMT"/>
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
bgstack15