[SCM] engrampa Debian package branch, master, updated. 974b1d62e7e5f02f3da23d2ef9e862b33db0711f

[Mike Gabriel]

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

The following commit has been merged in the master branch:
commit 223d6e488b1e94c736d5ed958d91fb2cfca1b691
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu May 8 00:16:23 2014 +0200

    debian/rules: Before running dh_install, drop the not-packaged engrampa.convert file.
---
 debian/rules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 1603ca7..771d5e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ DHFLAGS=--parallel
 
 override_dh_install:
 	rm -rfv debian/tmp/usr/lib/*/caja/extensions-2.0/libcaja-engrampa.la
+	rm -rfv debian/tmp/usr/share/MateConf/gsettings/engrampa.convert
 	dh_install --fail-missing
 
 override_dh_auto_configure:
@@ -46,4 +47,4 @@ $(PKG)_$(VER)$(DTYPE).orig.tar.xz:
 	@echo "# Packing..."
 	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
 	    | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
-	    && $(RM) -r "$(PKG)-$(VER)"
\ No newline at end of file
+	    && $(RM) -r "$(PKG)-$(VER)"

-- 
engrampa Debian package