[debian-edu-commits] debian-edu/ 01/01: Files in art-common/kde and art-common/kdm-theme: add support for the lines theme.

[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 16a1175b51bda192968cc22ce248742d8c0729a4
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Sep 27 01:32:50 2014 +0200

    Files in art-common/kde and art-common/kdm-theme: add support for the lines theme.
---
 art-common/kde/25debian-edu-artwork | 6 ++++++
 art-common/kdm-theme/kdm-default    | 5 +++++
 debian/changelog                    | 4 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/art-common/kde/25debian-edu-artwork b/art-common/kde/25debian-edu-artwork
index 949c0bd..6bb785d 100755
--- a/art-common/kde/25debian-edu-artwork
+++ b/art-common/kde/25debian-edu-artwork
@@ -12,4 +12,10 @@ case "$(readlink /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js
 		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/kdm-default b/art-common/kdm-theme/kdm-default
index 8c7b166..290221e 100755
--- a/art-common/kdm-theme/kdm-default
+++ b/art-common/kdm-theme/kdm-default
@@ -11,4 +11,9 @@ case "$(readlink /usr/share/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/debian/changelog b/debian/changelog
index f2f4d21..adef9cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,13 +14,15 @@ debian-edu-artwork (0.48) UNRELEASED; urgency=high
       + debian-edu-artwork-lines.manpages
       + update-debian-edu-artwork-lines
       + update-debian-edu-artwork-lines.8
-    - Adjust each Makefile.am the directory art-lines and subdirs.
+    - Adjust each Makefile.am in the directory art-lines and subdirs.
     - Replace joy theme related files with lines theme ones.
     - Remove png files in the kde directory, they dont seem to be needed.
     - Generate the 640x480 png grub image from a 1600x1200 svg file out
       of the playground/jessie dir, by adding (in the splash subdir)
       'convert $@ -resize 640x $@' to Makefile.am.
     - Add 2560x1080 wallpaper.
+  * Files in art-common/kde and art-common/kdm-theme: add support for
+    the lines theme.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 24 Sep 2014 18:43:30 +0200
 

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