* New upstream release

  * debian/control.in:
  - bumped Standards-Version to 3.6.2.1
  * debian/copyright:
  - updated FSF's address
  * debian/patches/00_man_escape_hyphens.diff:
  - properly escape all hyphens in the zenity.1 manpage

5 files changed, 71 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 70f77ac2..1a331fe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+zenity (2.10.1-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control.in:
+  - bumped Standards-Version to 3.6.2.1
+  * debian/copyright:
+  - updated FSF's address
+  * debian/patches/00_man_escape_hyphens.diff:
+  - properly escape all hyphens in the zenity.1 manpage
+
+ -- Guilherme de S. Pastore <guilherme.pastore@terra.com.br>  Thu, 15 Sep 2005 15:38:46 -0300
+
 zenity (2.10.0-2) unstable; urgency=low
 
   * Upload to unstable
diff --git a/debian/control b/debian/control
index 664064fd..e19824bd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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.6.0), libglade2-dev, libgnomecanvas2-dev, libxt-dev
-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>, Carlos Perelló Marín <carlos@pemas.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.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>, Takuo KITAME <kitame@debian.org>
-Standards-Version: 3.6.1.0
+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>, Carlos Perelló Marín <carlos@pemas.net>, Clément Stenac <zorglub@debian.org>, Ed Boraas <ed@debian.org>, Edd Dumbill <ejad@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
 
 Package: zenity
 Architecture: any
diff --git a/debian/control.in b/debian/control.in
index 41b6289c..cda36ff7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ 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.6.0), libglade2-dev, libgnomecanvas2-dev, libxt-dev
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.2.1
 
 Package: zenity
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index d15c7a75..20916a7e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,8 +18,7 @@ Copyright:
 
    You should have received a copy of the GNU General Public License
    along with this package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/patches/00_man_escape_hyphens.diff b/debian/patches/00_man_escape_hyphens.diff
new file mode 100644
index 00000000..5b52e607
--- /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 --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