[SCM] mate-file-manager Debian package branch, master, updated. f6f6f8f0d4e945ce2f25bca6d38c52abc9a75419

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/caja.git;a=commitdiff;h=3d6e8ea

The following commit has been merged in the master branch:
commit 3d6e8ea5b95a4ec6e00cd2fc4d0649319015e904
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Feb 9 19:26:57 2014 +0100

    debian/patches: fix patch for caja-autorun-software man page
---
 ...001_add-manpage-for-caja-autorun-software.patch | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/debian/patches/2001_add-manpage-for-caja-autorun-software.patch b/debian/patches/2001_add-manpage-for-caja-autorun-software.patch
index 3bc9139..06fa36a 100644
--- a/debian/patches/2001_add-manpage-for-caja-autorun-software.patch
+++ b/debian/patches/2001_add-manpage-for-caja-autorun-software.patch
@@ -1,16 +1,9 @@
-From 70559a30ba34d71d0d9567457c3ec20de7d25fb7 Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Thu, 26 Sep 2013 09:34:43 +0000
-Subject: Add manpage for caja-autorun-software
-
-Closes #114
-https://github.com/mate-desktop/mate-file-manager/issues/114
----
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 71c07ba..6244750 100644
+Description: Manual page for caja-autorun-software
+Author: Stefano Karapetsas <stefano at karapetsas.com>
+Origin: https://github.com/mate-desktop/caja/commit/70559a30ba34d71d0d9567457c3ec20de7d25fb7
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
-@@ -4,6 +4,7 @@ SUBDIRS = reference
+@@ -4,6 +4,7 @@
  
  man_MANS = \
  	caja.1 \
@@ -18,10 +11,7 @@ index 71c07ba..6244750 100644
  	caja-connect-server.1 \
  	caja-file-management-properties.1 \
  	$(NULL)
-diff --git a/docs/caja-autorun-software.1 b/docs/caja-autorun-software.1
-new file mode 100644
-index 0000000..b079708
---- a/dev/null
+--- a/docs/caja-autorun-software.1
 +++ b/docs/caja-autorun-software.1
 @@ -0,0 +1,14 @@
 +.IX Title "caja-autorun-software 1"
@@ -38,5 +28,3 @@ index 0000000..b079708
 +.SH "LICENSE"
 +.IX Header "LICENSE"
 +\&\s-1GPL\s0 v2 or later
---
-cgit 

-- 
mate-file-manager Debian package