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

[Mike Gabriel]

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

The following commit has been merged in the master branch:
commit 6fc1a71a164dbfb6c2a5fca27272c474c80132cd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Apr 5 22:11:24 2014 +0200

    debian/patches: Drop 1002_fix-caja-autorun-software-man-page.patch. Applied upstream.
---
 .../patches/1002_fix-caja-autorun-software-man-page.patch  | 14 --------------
 debian/patches/series                                      |  1 -
 2 files changed, 15 deletions(-)

diff --git a/debian/patches/1002_fix-caja-autorun-software-man-page.patch b/debian/patches/1002_fix-caja-autorun-software-man-page.patch
deleted file mode 100644
index 61499e2..0000000
--- a/debian/patches/1002_fix-caja-autorun-software-man-page.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Add whatis field to caja-autorun-software man page
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/caja/issues/254
---- a/docs/caja-autorun-software.1
-+++ b/docs/caja-autorun-software.1
-@@ -1,7 +1,7 @@
- .IX Title "caja-autorun-software 1"
- .TH caja-autorun-software 1 "26 Sep 2013"
- .SH "NAME"
--caja\-autorun\-software
-+caja\-autorun\-software \- Manage Auto-run of Software with Caja
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- This executable is part of the package 'caja': The \s-1MATE\s0 Desktop File Manager
diff --git a/debian/patches/series b/debian/patches/series
index 753965f..58c61c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-1002_fix-caja-autorun-software-man-page.patch
 1003_fix-missing-main-category-in-desktop-files.patch

-- 
mate-file-manager Debian package