[debian-edu-commits] debian-edu/ 82/437: * revert changes here and move them into the debian-edu-config package

[Mike Gabriel]

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

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

commit 373b5b863fa5f603b87d065eed5e5d4b2fdac36a
Author: Steffen Joeris <white at debian.org>
Date:   Fri Sep 15 07:03:56 2006 +0000

    * revert changes here and move them into the
      debian-edu-config package
---
 art/kde/Makefile.am   |  8 ++------
 debian/changelog      |  8 --------
 debian/update-artwork | 18 ------------------
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/art/kde/Makefile.am b/art/kde/Makefile.am
index bb1937a..aadc74b 100644
--- a/art/kde/Makefile.am
+++ b/art/kde/Makefile.am
@@ -6,16 +6,12 @@ kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
 Xsessiondir      = /etc/X11/Xsession.d/
 Xsession_DATA    = 25debian-edu-artwork
 
-kdedefaultdir    = /usr/share/debian-edu-artwork/kde-profile/default/share/config
+kdedefaultdir    = /usr/share/debian-edu-artwork/kde-profile/share/config
 kdedefault_DATA  = kdesktoprc
 
-kdeprofile_debian_edu_pupilsdir = /usr/share/debian-edu-artwork/kde-profile/debian_edu_pupils/share/config
-kdeprofile_debian_edu_pupils_DATA  = kdesktoprc
-
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(kdeimgdir)
 	$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
 	$(mkinstalldirs) $(DESTDIR)$(kdedefaultdir)
-	$(mkinstalldirs) $(DESTDIR)$(kdeprofile_debian_edu_pupilsdir)
 
-EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA) $(kde_debian_edu_pupils_DATA)
+EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA)
diff --git a/debian/changelog b/debian/changelog
index d7256d5..91dc01f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,14 +6,6 @@ debian-edu-artwork (0.0.11~1) unstable; urgency=low
     that "source" files should be included for the images to make them
     easy to modify.
 
-  [ Steffen Joeris ]
-  * Add code to update-artwork to start the kde kiosk
-    profiles for debian-edu which creates basic configuration for
-    the /etc/kderc and the /etc/kde-user-profile as a mapping file
-  * Install the kdesktoprc now under a default dir which can be used
-    by 25debian-edu-artwork for a general configuration to make sure
-    it does not interfere the kiosk profiles
-
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 14 Sep 2006 22:52:53 +0200
 
 debian-edu-artwork (0.0.10) unstable; urgency=low
diff --git a/debian/update-artwork b/debian/update-artwork
index 3130eb5..2c437fb 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -65,28 +65,10 @@ restore_kdm_theme() {
     fi
 }
 
-activate_kiosk_profiles() {
-	KIOSK_MAP_FILE="/etc/kde-user-profile"
-	KIOSK_CONFIG_FILE="/etc/kderc"
-	# Install the file kde-user-profile if it does not exist to ensure
-	# we can use our kiosk modes
-	if [ ! -e "$KIOSK_MAP_FILE" ] ; then
-	        $editini $KIOSK_MAP_FILE 'General' 'groups' 'students'
-	        $editini $KIOSK_MAP_FILE 'Groups' 'students' 'debian_edu_pupils'
-	fi
-
-	if [ ! -e "$KIOSK_CONFIG_FILE" ] ; then
-		$editini $KIOSK_CONFIG_FILE 'Directories' 'userProfileMapFile' '/etc/kde-user-profile'
-		$editini $KIOSK_CONFIG_FILE 'Directories-debian_edu_pupils' 'ProfileDescription' 'Debian-Edu Profile for pupils'
-		$editini $KIOSK_CONFIG_FILE 'Directories-debian_edu_pupils' 'prefixes' '/usr/share/debian-edu-artwork/kde-profile/debian_edu_pupils'
-	fi
-}
-
 case "$1" in
   configure)
     change_ldm_background
     change_kdm_theme
-    activate_kiosk_profiles
     ;;
   remove)
     restore_kdm_theme

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