[SCM] marco Debian package branch, master, updated. 3dd747ada0b8f8b83f20bc6052b0aa9dcf9c1b26

[Mike Gabriel]

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

The following commit has been merged in the master branch:
commit c9e882c1964c350d5a0578629b208d304d5d9011
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Mar 11 17:53:18 2014 +0100

    debian/patches: Drop patch 1001_hypen-used-as-minus-sign-on-man-page.patch. Fixed upstream.
---
 .../1001_hypen-used-as-minus-sign-on-man-page.patch        | 14 --------------
 debian/patches/series                                      |  1 -
 2 files changed, 15 deletions(-)

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
deleted file mode 100644
index bc9e306..0000000
--- a/debian/patches/1001_hypen-used-as-minus-sign-on-man-page.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/series b/debian/patches/series
deleted file mode 100644
index 59ea29b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-1001_hypen-used-as-minus-sign-on-man-page.patch

-- 
marco Debian package