summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rw-r--r--debian/patches/00_man_escape_hyphens.diff55
-rw-r--r--debian/patches/01_manpage_fix.patch12
3 files changed, 21 insertions, 55 deletions
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 <jordi@debian.org> 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 <glynn.foster@sun.com>.
- .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 <glynn.foster@sun.com>.
+ .P
bgstack15