summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
-rw-r--r--debian/control6
-rw-r--r--debian/control.in4
-rw-r--r--debian/patches/00_man_escape_hyphens.diff55
-rw-r--r--debian/patches/01_manpage_fix.patch12
5 files changed, 71 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog
index ccdbc11c..527cc68a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+zenity (2.16.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * 01_manpage_fix.patch: removed, integrated upstream.
+ * Standards version is 3.7.2.
+ * Bump intltool and gtk+ requirements.
+ * Remove build-dependency on libpopt.
+ * Build-depend on libnotify-dev.
+
+ -- Josselin Mouette <joss@debian.org> Wed, 13 Sep 2006 19:44:19 +0200
+
zenity (2.14.3-2) UNRELEASED; urgency=low
* Fix bashism.
diff --git a/debian/control b/debian/control
index 4aa0413c..4685f407 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: zenity
Section: gnome
Priority: optional
Maintainer: Ross Burton <ross@debian.org>
-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 <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Clément Stenac <zorglub@debian.org>, Dafydd Harries <daf@debian.org>, Ed Boraas <ed@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Guilherme de S. Pastore <guilherme.pastore@terra.com.br>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <jr.debian@rohr.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Marc 'HE' Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Sebastien Bacher <seb128@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Takuo KITAME <kitame@debian.org>
-Standards-Version: 3.6.2.1
+Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, 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.1)
+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>, 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
Package: zenity
Architecture: any
diff --git a/debian/control.in b/debian/control.in
index 84366d72..dc2611e2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,9 +2,9 @@ Source: zenity
Section: gnome
Priority: optional
Maintainer: Ross Burton <ross@debian.org>
-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)
+Build-Depends: debhelper (>= 4.1.54), cdbs (>= 0.4.4), gnome-pkg-tools, 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.1)
Uploaders: @GNOME_TEAM@
-Standards-Version: 3.6.2.1
+Standards-Version: 3.7.2
Package: zenity
Architecture: any
diff --git a/debian/patches/00_man_escape_hyphens.diff b/debian/patches/00_man_escape_hyphens.diff
new file mode 100644
index 00000000..c5ab143c
--- /dev/null
+++ b/debian/patches/00_man_escape_hyphens.diff
@@ -0,0 +1,55 @@
+--- 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 <glynn.foster@sun.com>.
+ .P
diff --git a/debian/patches/01_manpage_fix.patch b/debian/patches/01_manpage_fix.patch
deleted file mode 100644
index f20b9a58..00000000
--- a/debian/patches/01_manpage_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 <glynn.foster@sun.com>.
- .P
bgstack15