* New upstream release

* debian/patches/00_man_escape_hyphens.diff:
  - dropped; applied upstream
* debian/rules:
  - pass --disable-scrollkeeper to configure

3 files changed, 12 insertions, 55 deletions

diff --git a/debian/changelog b/debian/changelog
index 1a331fe3..cd8e5c96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+zenity (2.12.1-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/patches/00_man_escape_hyphens.diff:
+    - dropped; applied upstream
+  * debian/rules:
+    - pass --disable-scrollkeeper to configure
+
+ -- Guilherme de S. Pastore <guilherme.pastore@terra.com.br>  Sat, 29 Oct 2005 01:43:05 -0200
+
 zenity (2.10.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/00_man_escape_hyphens.diff b/debian/patches/00_man_escape_hyphens.diff
deleted file mode 100644
index 5b52e607..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 --title "Search Results" --text "Finding all header files.." --column "Files"
-+find . \-name '*.h' | zenity \-\-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/rules b/debian/rules
index 47f7e9a9..6950db61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
+
 binary-post-install/zenity::
 	rm -rf debian/zenity/var