[SCM] mate-desktop-environment Debian package branch, master, updated. 8e27dce8bb7b18b315720d9238750bb36bc145c7

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-desktop-environment.git;a=commitdiff;h=8e27dce

The following commit has been merged in the master branch:
commit 8e27dce8bb7b18b315720d9238750bb36bc145c7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 11 21:22:59 2014 +0200

    Drop gnome-keyring startup hack again, it is implemented in MATE 1.8's session manager.
---
 debian/mate-desktop-environment-core.postinst | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/debian/mate-desktop-environment-core.postinst b/debian/mate-desktop-environment-core.postinst
deleted file mode 100755
index 60e7699..0000000
--- a/debian/mate-desktop-environment-core.postinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	# For Debian jessie and beyond, gnome-keyring also starts in MATE desktop environments.
-	# For Debian wheezy, we ship our own .desktop files to start gnome-keyring
-	# Those we need to hard-remove if Debian wheezy is upgraded to jessie or later...
-	ls /etc/xdg/autostart/gnome-keyring-*.desktop 2>/dev/null | while read filename; do
-		if egrep "^OnlyShowIn=.*MATE;.*" "$filename" 1>/dev/null; then
-			rm -f "${filename/gnome-keyring-/mate-gnome-keyring-}"
-		else
-			if [ ! -f "${filename/gnome-keyring-/mate-gnome-keyring-}" ]; then
-				cp "$filename" "${filename/gnome-keyring-/mate-gnome-keyring-}"
-				sed -i "${filename/gnome-keyring-/mate-gnome-keyring-}" \
-				    -e "s/OnlyShowIn=.*/OnlyShowIn=MATE;/"
-			fi
-		fi
-	done
-fi
-
-#DEBHELPER#

-- 
mate-desktop-environment Debian package