* New upstream translation and bugfix release.

  + Features a timeout option. Closes: #354959.
* 01_manpage.patch: removed, integrated upstream.

2 files changed, 8 insertions, 154 deletions

diff --git a/debian/changelog b/debian/changelog
index 16b0e60c..749885c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zenity (2.20.0-1) unstable; urgency=low
+
+  * New upstream translation and bugfix release.
+    + Features a timeout option. Closes: #354959.
+  * 01_manpage.patch: removed, integrated upstream.
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 22 Sep 2007 16:53:28 +0200
+
 zenity (2.18.2-1) unstable; urgency=low
 
   * New upstream bugfix and translation release.
diff --git a/debian/patches/01_manpage.patch b/debian/patches/01_manpage.patch
deleted file mode 100644
index 9d4b6a3e..00000000
--- a/debian/patches/01_manpage.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- trunk/data/zenity.1	2006/03/31 22:49:57	963
-+++ trunk/data/zenity.1	2007/05/14 18:18:01	1207
-@@ -34,7 +34,7 @@
- .B \-\-error
- Display error dialog
- .TP
--.B \-\-file-selection
-+.B \-\-file\-selection
- Display file selection dialog
- .TP
- .B \-\-info
-@@ -57,6 +57,9 @@
- .TP
- .B \-\-warning
- Display warning dialog
-+.TP
-+.B \-\-scale
-+Display scale dialog
- 
- .PP
- General options
-@@ -89,7 +92,7 @@
- .B \-\-year=INT
- Set the calendar year
- .TP
--.B \-\-date-format=STRING
-+.B \-\-date-format=PATTERN
- Set the format for the returned date
- 
- .PP
-@@ -110,6 +113,9 @@
- .TP
- .B \-\-text=STRING
- Set the dialog text
-+.TP
-+.B \-\-no\-wrap
-+Do not enable text wrapping
- 
- .PP
- File selection options
-@@ -120,14 +126,26 @@
- .B \-\-multiple
- Allow selection of multiple filenames in file selection dialog
- .TP
-+.B \-\-directory
-+Activate directory-only selection
-+.TP
-+.B \-\-save
-+Activate save mode
-+.TP
- .B \-\-separator=SEPARATOR
- Specify separator character when returning multiple filenames
-+.TP
-+.B \-\-confirm\-overwrite
-+Confirm file selection if filename already exists
- 
- .PP
- Info options
- .TP
- .B \-\-text=STRING
- Set the dialog text
-+.TP
-+.B \-\-no\-wrap
-+Do not enable text wrapping
- 
- .PP
- List options
-@@ -148,12 +166,18 @@
- .B \-\-separator=STRING
- Set output separator character
- .TP
-+.B \-\-multiple
-+Allow multiple rows to be selected
-+.TP
- .B \-\-editable
- Allow changes to text
- .TP
- .B \-\-print-column=STRING
- Specify what column to print to standard output. The default is to return
- the first column. 'ALL' may be used to print all columns.
-+.TP
-+.B \-\-hide\-column=NUMBER
-+Hide a specific column
- 
- .PP
- Notification options
-@@ -161,6 +185,9 @@
- .TP
- .B \-\-text=STRING
- Set the notification text
-+.TP
-+.B \-\-listen
-+Listen for commands on stdin
- 
- .PP
- Progress options
-@@ -175,13 +202,21 @@
- .B \-\-auto\-close
- Close dialog when 100% has been reached
- .TP
-+.B \-\-auto\-kill
-+Kill parent process if cancel button is pressed
-+.TP
- .B \-\-pulsate
- Pulsate progress bar
-- 
-+
-+.PP
- Question options
-+
- .TP
- .B \-\-text=STRING
- Set the dialog text
-+.TP
-+.B \-\-no\-wrap
-+Do not enable text wrapping
- 
- .PP
- Text options
-@@ -199,6 +234,34 @@
- .TP
- .B \-\-text=STRING
- Set the dialog text
-+.TP
-+.B \-\-no\-wrap
-+Do not enable text wrapping
-+
-+.PP
-+Scale options
-+
-+.TP
-+.B \-\-text=STRING
-+Set the dialog text
-+.TP
-+.B \-\-value=VALUE
-+Set initial value
-+.TP
-+.B \-\-min\-value=VALUE
-+Set minimum value
-+.TP
-+.B \-\-max\-value=VALUE
-+Set maximum value
-+.TP
-+.B \-\-step=VALUE
-+Set step size
-+.TP
-+.B \-\-print\-partial
-+Print partial values
-+.TP
-+.B \-\-hide\-value
-+Hide value
- 
- .PP
- Miscellaneous options