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

[Stefano Karapetsas]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-file-manager.git;a=commitdiff;h=06103ae

The following commit has been merged in the master branch:
commit 06103ae4435e0551d8e7ba2969e4dd5bba72d218
Author: Stefano Karapetsas <stefano at karapetsas.com>
Date:   Wed Oct 16 16:22:08 2013 +0200

    Cherry pick another patch
---
 debian/patches/07-fix-icons-dir.patch |   34 +++++++++++++++++++++++++++++++++
 debian/patches/series                 |    1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/07-fix-icons-dir.patch b/debian/patches/07-fix-icons-dir.patch
new file mode 100644
index 0000000..49623ad
--- /dev/null
+++ b/debian/patches/07-fix-icons-dir.patch
@@ -0,0 +1,34 @@
+From 522d6ec8550e011f1bc538d9798dbbbf9b24d2a8 Mon Sep 17 00:00:00 2001
+From: Wolfgang Ulbrich <chat-to-me at raveit.de>
+Date: Thu, 18 Jul 2013 20:55:03 +0000
+Subject: fix_privat-icons-dir
+
+to avoid this direction.
+%{_datadir}/mate-file-manager/icons/hicolor/*/emblems/emblem-note.png
+---
+diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
+index 8293154..87345eb 100644
+--- a/data/icons/Makefile.am
++++ b/data/icons/Makefile.am
+@@ -61,8 +61,8 @@ install-icons:
+ 		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ 		SIZE=`echo $$icon | cut -d_ -f3`; \
+ 		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+-		mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+-		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
++		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
++		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ 	done
+ 
+ uninstall-icons:
+@@ -78,7 +78,7 @@ uninstall-icons:
+ 		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ 		SIZE=`echo $$icon | cut -d_ -f3`; \
+ 		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+-		rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
++		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ 	done
+ 
+ install-data-local: install-icons update-icon-cache
+--
+cgit 
diff --git a/debian/patches/series b/debian/patches/series
index e291004..25126ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 04-fix-segfaults-with-thumbnails-frames.patch
 05-fix-crash-during-file-rename-in-external-devices.patch
 06-properly-free-GHashTable-in-properties-window.patch
+07-fix-icons-dir.patch

-- 
mate-file-manager Debian package