[debian-edu-commits] debian-edu/ 02/09: art-common: Drop kdm-theme as kdm is gone; rename subdir kde -> x11.

[Wolfgang Schweer]

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

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

commit 85c050561f76c08ada625cc5cfe3b2b4016fd7be
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Oct 28 13:54:48 2016 +0200

    art-common: Drop kdm-theme as kdm is gone; rename subdir kde -> x11.
---
 art-common/Makefile.am              |  5 ++---
 art-common/kde/25debian-edu-artwork | 21 ---------------------
 art-common/kdm-theme/Makefile.am    |  3 ---
 art-common/kdm-theme/kdm-default    | 19 -------------------
 art-common/x11/25debian-edu-artwork | 15 +++++++++++++++
 art-common/{kde => x11}/Makefile.am |  0
 6 files changed, 17 insertions(+), 46 deletions(-)

diff --git a/art-common/Makefile.am b/art-common/Makefile.am
index 53f51d1..410d77f 100644
--- a/art-common/Makefile.am
+++ b/art-common/Makefile.am
@@ -1,5 +1,4 @@
 SUBDIRS = \
 		gdm-theme \
-		kde \
-		kdm-theme \
-		mate
+		mate \
+		x11
diff --git a/art-common/kde/25debian-edu-artwork b/art-common/kde/25debian-edu-artwork
deleted file mode 100755
index 6bb785d..0000000
--- a/art-common/kde/25debian-edu-artwork
+++ /dev/null
@@ -1,21 +0,0 @@
-case "$(readlink /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js)" in
-
-	# Debian Edu Spacefun (squeeze)
-	"/usr/share/debian-edu-artwork-spacefun/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js")
-		KDEDIRS="/usr/share/debian-edu-artwork-spacefun/kde-profile:$KDEDIRS"
-		export KDEDIRS
-	;;
-
-	# Debian Edu Joy (wheezy)
-	"/usr/share/debian-edu-artwork-joy/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js")
-		KDEDIRS="/usr/share/debian-edu-artwork-joy/kde-profile:$KDEDIRS"
-		export KDEDIRS
-	;;
-
-	# 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
-	;;
-
-esac
diff --git a/art-common/kdm-theme/Makefile.am b/art-common/kdm-theme/Makefile.am
deleted file mode 100644
index 10b0af8..0000000
--- a/art-common/kdm-theme/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/default/kdm.d
-	$(INSTALL_DATA) kdm-default $(DESTDIR)$(sysconfdir)/default/kdm.d/20_debian-edu
diff --git a/art-common/kdm-theme/kdm-default b/art-common/kdm-theme/kdm-default
deleted file mode 100755
index 290221e..0000000
--- a/art-common/kdm-theme/kdm-default
+++ /dev/null
@@ -1,19 +0,0 @@
-USETHEME="true"
-case "$(readlink /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js)" in
-
-	# Debian Edu Spacefun (squeeze)
-	"/usr/share/debian-edu-artwork-spacefun/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js")
-		THEME="/usr/share/kde4/apps/kdm/themes/debian-edu-spacefun"
-	;;
-
-	# Debian Edu Joy (wheezy)
-	"/usr/share/debian-edu-artwork-joy/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js")
-		THEME="/usr/share/kde4/apps/kdm/themes/debian-edu-joy"
-	;;
-
-	# Debian Edu Lines (jessie)
-	"/usr/share/debian-edu-artwork-lines/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js")
-		THEME="/usr/share/kde4/apps/kdm/themes/debian-edu-lines"
-	;;
-
-esac
diff --git a/art-common/x11/25debian-edu-artwork b/art-common/x11/25debian-edu-artwork
new file mode 100755
index 0000000..6bef5c3
--- /dev/null
+++ b/art-common/x11/25debian-edu-artwork
@@ -0,0 +1,15 @@
+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 Sharp (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/kde/Makefile.am b/art-common/x11/Makefile.am
similarity index 100%
rename from art-common/kde/Makefile.am
rename to art-common/x11/Makefile.am

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