[debian-edu-commits] debian-edu/ 02/09: Drop no longer needed KDE configuration, now set via alternatives.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-artwork.

commit 6189e758355ac032d74dfcbfea42a3aff9aa3fea
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Dec 22 21:28:23 2016 +0100

    Drop no longer needed KDE configuration, now set via alternatives.
---
 art-common/Makefile.am              |  3 +--
 art-common/x11/25debian-edu-artwork | 15 ---------------
 art-common/x11/Makefile.am          |  7 -------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/art-common/Makefile.am b/art-common/Makefile.am
index 410d77f..e60bce2 100644
--- a/art-common/Makefile.am
+++ b/art-common/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = \
 		gdm-theme \
-		mate \
-		x11
+		mate
diff --git a/art-common/x11/25debian-edu-artwork b/art-common/x11/25debian-edu-artwork
deleted file mode 100755
index 1eee84e..0000000
--- a/art-common/x11/25debian-edu-artwork
+++ /dev/null
@@ -1,15 +0,0 @@
-case "$(readlink /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/)" in
-
-	# Debian Edu Lines (jessie)
-	"/usr/share/debian-edu-artwork-lines/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js")
-		KDEDIRS="/usr/share/debian-edu-artwork-lines/kde-profile:$KDEDIRS"
-		export KDEDIRS
-	;;
-
-	# Debian Edu soft Waves (stretch)
-	"/usr/share/debian-edu-artwork-stretch/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js")
-		KDEDIRS="/usr/share/debian-edu-artwork-stretch/kde-profile:$KDEDIRS"
-		export KDEDIRS
-	;;
-
-esac
diff --git a/art-common/x11/Makefile.am b/art-common/x11/Makefile.am
deleted file mode 100644
index 5ea8c80..0000000
--- a/art-common/x11/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-Xsessiondir      = /etc/X11/Xsession.d/
-Xsession_DATA    = 25debian-edu-artwork
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
-
-EXTRA_DIST = $(Xsession_DATA)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git