summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
-rw-r--r--debian/patches/01_manpage.patch154
-rw-r--r--debian/preinst13
3 files changed, 166 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index 88d841b1..16b0e60c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+zenity (2.18.2-1) unstable; urgency=low
+
+ * New upstream bugfix and translation release.
+ + correctly handle UTF-8 input text in the text info dialog
+ (closes: #410728).
+ * preinst: removed now this fix has been in a stable release
+ (closes: #213317 by obscolescence).
+ * 01_manpage.patch: manual page update from Sven Arvidsson
+ (closes: #317726).
+
+ -- Josselin Mouette <joss@debian.org> Sun, 03 Jun 2007 16:45:54 +0200
+
zenity (2.18.1-1) unstable; urgency=low
* Finish merging 2.14.3-2; SVN r8332:9108.
diff --git a/debian/patches/01_manpage.patch b/debian/patches/01_manpage.patch
new file mode 100644
index 00000000..9d4b6a3e
--- /dev/null
+++ b/debian/patches/01_manpage.patch
@@ -0,0 +1,154 @@
+--- 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
diff --git a/debian/preinst b/debian/preinst
deleted file mode 100644
index 0c6b6fb4..00000000
--- a/debian/preinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "install" = "$1" ] || [ "upgrade" = "$1" ]; then
- if [ "`dpkg-divert --list zenity`" != "" ]; then
- # I borked the divert earlier, this is left behind from gnome-utils.
- rm -f /usr/bin/gdialog.real
- dpkg-divert --package zenity --remove /usr/bin/gdialog
- fi
-fi
-
-#DEBHELPER#
bgstack15