From a2af3f0a8b4ab5a1c67ed2a8ee766d7b36a6f547 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sun, 8 Jan 2006 15:38:57 +0000 Subject: [ Josselin Mouette ] * Upload to unstable. -- Josselin Mouette Sun, 8 Jan 2006 16:37:55 +0100 --- debian/changelog | 28 ++++++++++++++++++++++++++++ debian/control | 6 ++---- debian/control.in | 6 ++---- debian/patches/00_man_escape_hyphens.diff | 4 ++-- debian/rules | 4 ++-- debian/watch | 2 +- 6 files changed, 37 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1a331fe3..b8c2318e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,31 @@ +zenity (2.12.1-2) unstable; urgency=low + + [ Loic Minier ] + * Update watch file to end with an even digit. [debian/watch] + + [ Josselin Mouette ] + * Upload to unstable. + + -- Josselin Mouette Sun, 8 Jan 2006 16:37:55 +0100 + +zenity (2.12.1-1) experimental; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream releases + * debian/control.in: + - added build dependency on gnome-doc-utils + * debian/rules: + - pass --disable-scrollkeeper to configure + + [ Loic Minier ] + * Bump libglib2.0-dev build-dep to >= 2.7.3. + * Add CDBS' utils. + * Remove obsolete Conflict/Replace on gnome-utils. + * Drop obsolete debian/zenity/var cleanup. + * Update man page dash escaping patch, 00_man_escape_hyphens.diff. + + -- Loic Minier Sat, 29 Oct 2005 16:22:16 +0200 + zenity (2.10.1-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index e19824bd..361e5752 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,13 @@ Source: zenity Section: gnome Priority: optional Maintainer: Ross Burton -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.6.0), libglade2-dev, libgnomecanvas2-dev, libxt-dev +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 , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Guilherme de S. Pastore , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Sebastien Bacher , Sjoerd Simons , Takuo KITAME Standards-Version: 3.6.2.1 Package: zenity Architecture: any -Depends: ${shlibs:Depends}, scrollkeeper (>= 0.3.9) -Replaces: gnome-utils (<< 2.4.1-1) -Conflicts: gnome-utils (<< 2.4.1-1) +Depends: ${misc:Depends}, ${shlibs:Depends}, scrollkeeper (>= 0.3.9) 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 cda36ff7..84366d72 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,15 +2,13 @@ Source: zenity Section: gnome Priority: optional Maintainer: Ross Burton -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.6.0), libglade2-dev, libgnomecanvas2-dev, libxt-dev +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: @GNOME_TEAM@ Standards-Version: 3.6.2.1 Package: zenity Architecture: any -Depends: ${shlibs:Depends}, scrollkeeper (>= 0.3.9) -Replaces: gnome-utils (<< 2.4.1-1) -Conflicts: gnome-utils (<< 2.4.1-1) +Depends: ${misc:Depends}, ${shlibs:Depends}, scrollkeeper (>= 0.3.9) 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/patches/00_man_escape_hyphens.diff b/debian/patches/00_man_escape_hyphens.diff index 5b52e607..c5ab143c 100644 --- a/debian/patches/00_man_escape_hyphens.diff +++ b/debian/patches/00_man_escape_hyphens.diff @@ -33,8 +33,8 @@ Show the search results in a list dialog with the title \fISearch Results\fP and the text \fIFinding all header files...\fP. .IP --find . -name '*.h' | zenity --title "Search Results" --text "Finding all header files.." --column "Files" -+find . \-name '*.h' | zenity \-\-title "Search Results" \-\-text "Finding all header files.." \-\-column "Files" +-find . -name '*.h' | zenity --list --title "Search Results" --text "Finding all header files.." --column "Files" ++find . \-name '*.h' | zenity \-\-list \-\-title "Search Results" \-\-text "Finding all header files.." \-\-column "Files" .PP Show an icon in the notification area .IP diff --git a/debian/rules b/debian/rules index 47f7e9a9..24c91aaa 100755 --- a/debian/rules +++ b/debian/rules @@ -2,11 +2,11 @@ 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 -binary-post-install/zenity:: - rm -rf debian/zenity/var +DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper clean:: rm -f intltool-{update,merge,extract} diff --git a/debian/watch b/debian/watch index 87f2fa72..620cb945 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=2 -http://ftp.gnome.org/pub/gnome/sources/zenity/([\d\.]+)/zenity-([\d\.]+)\.tar\.gz +http://ftp.gnome.org/pub/gnome/sources/zenity/([\d\.]+)[02468]/zenity-([\d\.]+)\.tar\.gz -- cgit From c85bd73a0914399dc0e7d33efe66dd6c49841cd7 Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Wed, 5 Apr 2006 17:13:05 +0000 Subject: Update to 2.14.0. --- debian/changelog | 9 +++++ debian/patches/00_man_escape_hyphens.diff | 55 ------------------------------- debian/patches/01_manpage_fix.patch | 12 +++++++ 3 files changed, 21 insertions(+), 55 deletions(-) delete mode 100644 debian/patches/00_man_escape_hyphens.diff create mode 100644 debian/patches/01_manpage_fix.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b8c2318e..b87ad93b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +zenity (2.14.0-1) unstable; urgency=low + + * New upstream release. + * debian/patches/00_man_escape_hyphens.diff: removed, applied upstream. + * debian/patches/01_manpage_fix.patch: fix find invocation example in + manpage (taken from Ubuntu). + + -- Jordi Mallach Wed, 5 Apr 2006 19:01:56 +0200 + zenity (2.12.1-2) unstable; urgency=low [ Loic Minier ] diff --git a/debian/patches/00_man_escape_hyphens.diff b/debian/patches/00_man_escape_hyphens.diff deleted file mode 100644 index c5ab143c..00000000 --- a/debian/patches/00_man_escape_hyphens.diff +++ /dev/null @@ -1,55 +0,0 @@ ---- data/zenity.1 2004-09-13 04:51:51.000000000 -0300 -+++ data/zenity.1.new 2005-09-15 15:54:23.199172720 -0300 -@@ -10,7 +10,7 @@ - input. This allows you to present information, and ask for information - from the user, from all manner of shell scripts. - .PP --For example, \fBzenity --question\fP will return either 0 or 1, -+For example, \fBzenity \-\-question\fP will return either 0 or 1, - depending on whether the user pressed \fIOK\fP or \fICancel\fP. \fBzenity - --entry\fP will output on standard output what the user typed into the - text entry field. -@@ -221,36 +221,36 @@ - Display a file selector with the title \fISelect a file to - remove\fP. The file selected is returned on standard output. - .IP --zenity --title="Select a file to remove" --file-selection -+zenity \-\-title="Select a file to remove" \-\-file-selection - .PP - Display a text entry dialog with the title \fISelect Host\fP and the - text \fISelect the host you would like to flood-ping\fP. The entered - text is returned on standard output. - .IP --zenity --title "Select Host" --entry --text "Select the host you would like to flood-ping" -+zenity \-\-title "Select Host" \-\-entry \-\-text "Select the host you would like to flood-ping" - .PP - Display a dialog, asking \fIMicrosoft Windows has been found! Would - you like to remove it?\fP. The return code will be 0 (true in shell) - if \fIOK\fP is selected, and 1 (false) if \fICancel\fP is selected. - .IP --zenity --question --title "Alert" --text "Microsoft Windows has been found! Would you like to remove it?" -+zenity \-\-question \-\-title "Alert" \-\-text "Microsoft Windows has been found! Would you like to remove it?" - .PP - Show the search results in a list dialog with the title \fISearch Results\fP - and the text \fIFinding all header files...\fP. - .IP --find . -name '*.h' | zenity --list --title "Search Results" --text "Finding all header files.." --column "Files" -+find . \-name '*.h' | zenity \-\-list \-\-title "Search Results" \-\-text "Finding all header files.." \-\-column "Files" - .PP - Show an icon in the notification area - .IP --zenity --notification --window-icon=update.png --text "System update necessary!" -+zenity \-\-notification \-\-window-icon=update.png \-\-text "System update necessary!" - .PP - Display a weekly shopping list in a check list dialog with \fIApples\fP and \fIOranges\fP pre selected - .IP --zenity --list --checklist --column "Buy" --column "Item" TRUE Apples TRUE Oranges FALSE Pears FALSE Toothpaste -+zenity \-\-list \-\-checklist \-\-column "Buy" \-\-column "Item" TRUE Apples TRUE Oranges FALSE Pears FALSE Toothpaste - .PP - Display a progress dialog while searching for all the postscript files in your home directory - .P --find `echo $HOME` '*.ps' | zenity --progress --pulsate -+find `echo $HOME` '*.ps' | zenity \-\-progress \-\-pulsate - .SH AUTHOR - \fBZenity\fP was written by Glynn Foster . - .P diff --git a/debian/patches/01_manpage_fix.patch b/debian/patches/01_manpage_fix.patch new file mode 100644 index 00000000..f20b9a58 --- /dev/null +++ b/debian/patches/01_manpage_fix.patch @@ -0,0 +1,12 @@ +diff -Nur zenity-2.14.0/data/zenity.1 zenity-2.14.0.new/data/zenity.1 +--- zenity-2.14.0/data/zenity.1 2005-09-24 17:15:04.000000000 +0200 ++++ zenity-2.14.0.new/data/zenity.1 2006-03-31 19:17:01.000000000 +0200 +@@ -250,7 +250,7 @@ + .PP + Display a progress dialog while searching for all the postscript files in your home directory + .P +-find `echo $HOME` '*.ps' | zenity \-\-progress \-\-pulsate ++find $HOME -name '*.ps' | zenity \-\-progress \-\-pulsate + .SH AUTHOR + \fBZenity\fP was written by Glynn Foster . + .P -- cgit From 1a1c36d911f7b112b82215f5ec9cf5f2c8a51080 Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Wed, 5 Apr 2006 17:13:17 +0000 Subject: Update. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 361e5752..4aa0413c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: gnome Priority: optional Maintainer: Ross Burton 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 , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Guilherme de S. Pastore , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Sebastien Bacher , Sjoerd Simons , Takuo KITAME +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Clément Stenac , Dafydd Harries , Ed Boraas , Emil Soleyman-Zomalan , Guilherme de S. Pastore , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Sebastien Bacher , Sjoerd Simons , Takuo KITAME Standards-Version: 3.6.2.1 Package: zenity -- cgit From 800dbc70f73f484716c7c27613aeda1a351cce1c Mon Sep 17 00:00:00 2001 From: "Guilherme de S. Pastore" Date: Fri, 21 Apr 2006 14:36:32 +0000 Subject: update for 2.14.1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b87ad93b..ba4fc658 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zenity (2.14.1-1) unstable; urgency=low + + * New upstream release. + + -- Guilherme de S. Pastore Fri, 21 Apr 2006 11:22:20 -0300 + zenity (2.14.0-1) unstable; urgency=low * New upstream release. -- cgit From b8b72c63ac1b16a73289781f03f65dad11124a5a Mon Sep 17 00:00:00 2001 From: Loïc Minier Date: Mon, 29 May 2006 19:46:00 +0000 Subject: * New upstream release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ba4fc658..42736f5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zenity (2.14.2-1) unstable; urgency=low + + * New upstream release. + + -- Loic Minier Mon, 29 May 2006 21:44:14 +0200 + zenity (2.14.1-1) unstable; urgency=low * New upstream release. -- cgit From 0c2a2e01ca93b7c7e9f7e5d116031e5092309578 Mon Sep 17 00:00:00 2001 From: Loïc Minier Date: Mon, 7 Aug 2006 20:07:41 +0000 Subject: * New upstream release, "Hey Jude". --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 42736f5b..f1ad4645 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zenity (2.14.3-1) unstable; urgency=low + + * New upstream release, "Hey Jude". + + -- Loic Minier Mon, 7 Aug 2006 22:04:27 +0200 + zenity (2.14.2-1) unstable; urgency=low * New upstream release. -- cgit From 2c023b71e5f7d128d6b121fe66d71c2967b3679f Mon Sep 17 00:00:00 2001 From: Loïc Minier Date: Sun, 3 Sep 2006 10:19:11 +0000 Subject: * Fix bashism. --- debian/changelog | 6 ++++++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f1ad4645..ccdbc11c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zenity (2.14.3-2) UNRELEASED; urgency=low + + * Fix bashism. + + -- Loic Minier Sun, 3 Sep 2006 12:19:05 +0200 + zenity (2.14.3-1) unstable; urgency=low * New upstream release, "Hey Jude". diff --git a/debian/rules b/debian/rules index 24c91aaa..a4b60a05 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,6 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper clean:: - rm -f intltool-{update,merge,extract} + rm -f intltool-extract intltool-merge intltool-update rm -f po/.intltool-merge-cache rm -f help/C/zenity-C.omf.out -- cgit