[SCM] engrampa Debian package branch, master, updated. debian/1.8.0+dfsg1-6-8-ga4cfd74

[Mike Gabriel]

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

The following commit has been merged in the master branch:
commit cec1b00e1bd1e476b5ffac54c6ee5919179f8a75
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 23 12:54:52 2014 +0200

    debian/patches: Drop 0001_superfluous-dir-with-unar.patch. It is in this upstream release. Drop 1001_fix-hyphens-on-man-page.patch. Accepted upstream. Drop 1002_add-keywords-key-to-desktop-files.patch. Accepted upstream.
---
 .../patches/0001_superfluous-dir-with-unar.patch   | 30 ----------------------
 debian/patches/1001_fix-hyphens-on-man-page.patch  | 14 ----------
 .../1002_add-keywords-key-to-desktop-files.patch   | 13 ----------
 debian/patches/series                              |  3 ---
 4 files changed, 60 deletions(-)

diff --git a/debian/patches/0001_superfluous-dir-with-unar.patch b/debian/patches/0001_superfluous-dir-with-unar.patch
deleted file mode 100644
index 47dc537..0000000
--- a/debian/patches/0001_superfluous-dir-with-unar.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix superfluous directory with unar-decompressed .rar archives. 
-Author: Sander Sweers (https://github.com/infirit)
-Origin: https://github.com/mate-desktop/engrampa/commit/383d22b8dc070377508d66a1750cb1f4da71e4aa
-Abstract:
- Do not create superfluous directory when dragging files from engrampa
- to Caja/Thunar.
-
-diff --git a/src/fr-command-unarchiver.c b/src/fr-command-unarchiver.c
-index 3e32f25..d13f468 100644
---- a/src/fr-command-unarchiver.c
-+++ b/src/fr-command-unarchiver.c
-@@ -199,8 +199,7 @@ fr_command_unarchiver_extract (FrCommand  *comm,
- 	else
- 		fr_process_add_arg (comm->process, "-s");
- 
--	if (junk_paths)
--		fr_process_add_arg (comm->process, "-D");
-+	fr_process_add_arg (comm->process, "-D");
- 
- 	if ((comm->password != NULL) && (comm->password[0] != '

-- 
engrampa Debian package