[SCM] mate-window-manager Debian package branch, master, updated. 93125dc4e007ccd45a7c12a1d1f5a90acc856e89

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/marco.git;a=commitdiff;h=93125dc

The following commit has been merged in the master branch:
commit 93125dc4e007ccd45a7c12a1d1f5a90acc856e89
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 21 19:39:53 2014 +0100

    debian/patches: fix hyphen-used-minus-sign issue in marco man page
---
 .../1001_hypen-used-as-minus-sign-on-man-page.patch        | 14 ++++++++++++++
 debian/patches/README                                      |  3 +++
 debian/patches/series                                      |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/patches/1001_hypen-used-as-minus-sign-on-man-page.patch b/debian/patches/1001_hypen-used-as-minus-sign-on-man-page.patch
new file mode 100644
index 0000000..bc9e306
--- /dev/null
+++ b/debian/patches/1001_hypen-used-as-minus-sign-on-man-page.patch
@@ -0,0 +1,14 @@
+Description: Fix hyphen used as minus sign in man page
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Forwarded: https://github.com/mate-desktop/marco/issues/84
+--- a/doc/man/marco.1
++++ b/doc/man/marco.1
+@@ -34,7 +34,7 @@
+ Connect to X display 
IDISPLAY
P.
+ .TP
+ .B \-\-replace
+-a window manager which is running is replaced by 
Bmarco
P.  Users are encouraged to change the MATE window manager by running the new WM with the --replace or -replace option, and subsequently saving the session.
++a window manager which is running is replaced by 
Bmarco
P.  Users are encouraged to change the MATE window manager by running the new WM with the \-\-replace or \-replace option, and subsequently saving the session.
+ .TP
+ .B \-\-sm\-client\-id=ID
+ Specify a session management 
IID
P.
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..59ea29b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1001_hypen-used-as-minus-sign-on-man-page.patch

-- 
mate-window-manager Debian package