[SCM] mate-dialogs Debian package branch, master, updated. 085473f94847ab26b39f5780e881b2ebc67d38c8

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-dialogs.git;a=commitdiff;h=12ab121

The following commit has been merged in the master branch:
commit 12ab121728db83be70d56e228566edce54df81b7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Mar 7 00:13:03 2014 +0100

    debian/patches: Drop patch 1001_fix-use-hyphen-as-minus-sign.patch. Fixed upstream.
---
 .../1001_fix-use-hyphen-as-minus-sign.patch        | 106 ---------------------
 debian/patches/series                              |   1 -
 2 files changed, 107 deletions(-)

diff --git a/debian/patches/1001_fix-use-hyphen-as-minus-sign.patch b/debian/patches/1001_fix-use-hyphen-as-minus-sign.patch
deleted file mode 100644
index fd9b1af..0000000
--- a/debian/patches/1001_fix-use-hyphen-as-minus-sign.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Description: Fix several hypen-use-as-minus-sign issues
-Author: Mike Gabriel <sunweaver at debian.org>
-Forwarded: https://github.com/mate-desktop/mate-dialogs/issues/15
---- a/data/matedialog.1
-+++ b/data/matedialog.1
-@@ -12,14 +12,14 @@
- .PP
- For example, 
Bmatedialog \-\-question
P will return either 0 or 1,
- depending on whether the user pressed 
IOK
P or 
ICancel
P. 
Bmatedialog
----entry
P will output on standard output what the user typed into the
-+\-\-entry
P will output on standard output what the user typed into the
- text entry field.
- .PP
- Comprehensive documentation is available in the MATE Help Browser,
- under 
IMATE/Utilities
P.
- .SH OPTIONS
- This program follows the usual GNU command line syntax, with long
--options starting with two dashes (`-').
-+options starting with two dashes (`\-').
- 
- .PP
- Dialog options
-@@ -52,7 +52,7 @@
- .B \-\-question
- Display question dialog
- .TP
--.B \-\-text-info
-+.B \-\-text\-info
- Display text information dialog
- .TP
- .B \-\-warning
-@@ -61,7 +61,7 @@
- .B \-\-scale
- Display scale dialog
- .TP
--.B \-\-color-selection
-+.B \-\-color\-selection
- Display color selection dialog
- 
- .PP
-@@ -71,7 +71,7 @@
- .B \-\-title=TITLE
- Set the dialog title
- .TP
--.B \-\-window-icon=ICONPATH
-+.B \-\-window\-icon=ICONPATH
- Set the window icon with the path to an image. Alternatively, one of the four stock icons can be used: 'error', 'info', 'question' or 'warning'
- .TP
- .B \-\-width=WIDTH
-@@ -98,7 +98,7 @@
- .B \-\-year=INT
- Set the calendar year
- .TP
--.B \-\-date-format=PATTERN
-+.B \-\-date\-format=PATTERN
- Set the format for the returned date. The default depends on the user locale or be set with the strftime style. For example %A %d/%m/%y
- 
- .PP
-@@ -108,10 +108,10 @@
- .B \-\-text=STRING
- Set the dialog text
- .TP
--.B \-\-entry-text=STRING
-+.B \-\-entry\-text=STRING
- Set the entry text
- .TP
--.B \-\-hide-text
-+.B \-\-hide\-text
- Hide the entry text
- 
- .PP
-@@ -182,7 +182,7 @@
- .B \-\-editable
- Allow changes to text
- .TP
--.B \-\-print-column=NUMBER
-+.B \-\-print\-column=NUMBER
- 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
-@@ -322,13 +322,13 @@
- Display a file selector with the title 
ISelect a file to
- remove
P. The file selected is returned on standard output.
- .IP
--matedialog  \-\-title="Select a file to remove" \-\-file-selection
-+matedialog  \-\-title="Select a file to remove" \-\-file\-selection
- .PP
- Display a text entry dialog with the title 
ISelect Host
P and the
--text 
ISelect the host you would like to flood-ping
P. The entered
-+text 
ISelect the host you would like to flood\-ping
P. The entered
- text is returned on standard output.
- .IP
--matedialog  \-\-title "Select Host" \-\-entry \-\-text "Select the host you would like to flood-ping"
-+matedialog  \-\-title "Select Host" \-\-entry \-\-text "Select the host you would like to flood\-ping"
- .PP
- Display a dialog, asking 
IMicrosoft Windows has been found! Would
- you like to remove it?
P. The return code will be 0 (true in shell)
-@@ -343,7 +343,7 @@
- .PP
- Show an icon in the notification area
- .IP
--matedialog \-\-notification \-\-window-icon=update.png \-\-text "System update necessary!"
-+matedialog \-\-notification \-\-window\-icon=update.png \-\-text "System update necessary!"
- .PP
- Display a weekly shopping list in a check list dialog with 
IApples
P and 
IOranges
P pre selected
- .IP
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6092a76..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-1001_fix-use-hyphen-as-minus-sign.patch

-- 
mate-dialogs Debian package