[debian-edu-commits] debian-edu/ 78/437: * make sure that the kdesktoprc, which is a kind of default configuration, does not interfere with the kde kiosk profiles

[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 923ce8e503aaac96ea6f89f07aaf3d0347b793c2
Author: Steffen Joeris <white at debian.org>
Date:   Fri Sep 15 05:07:14 2006 +0000

    * make sure that the kdesktoprc, which is a kind of
      default configuration, does not interfere with the
      kde kiosk profiles
---
 art/kde/25debian-edu-artwork | 2 +-
 art/kde/Makefile.am          | 2 +-
 art/kde/Makefile.in          | 2 +-
 debian/changelog             | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/art/kde/25debian-edu-artwork b/art/kde/25debian-edu-artwork
index 7b02f0a..473cd39 100755
--- a/art/kde/25debian-edu-artwork
+++ b/art/kde/25debian-edu-artwork
@@ -1,2 +1,2 @@
-KDEDIRS="/usr/share/debian-edu-artwork/kde-profile:$KDEDIRS"
+KDEDIRS="/usr/share/debian-edu-artwork/kde-profile/default:$KDEDIRS"
 export KDEDIRS
diff --git a/art/kde/Makefile.am b/art/kde/Makefile.am
index aadc74b..da3cce0 100644
--- a/art/kde/Makefile.am
+++ b/art/kde/Makefile.am
@@ -6,7 +6,7 @@ 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/share/config
+kdedefaultdir    = /usr/share/debian-edu-artwork/kde-profile/default/share/config
 kdedefault_DATA  = kdesktoprc
 
 install-data-local:
diff --git a/art/kde/Makefile.in b/art/kde/Makefile.in
index d86e3ee..b2a4b6b 100644
--- a/art/kde/Makefile.in
+++ b/art/kde/Makefile.in
@@ -143,7 +143,7 @@ kdeimgdir = $(datadir)/wallpapers
 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/share/config
+kdedefaultdir = /usr/share/debian-edu-artwork/kde-profile/default/share/config
 kdedefault_DATA = kdesktoprc
 EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA)
 all: all-am
diff --git a/debian/changelog b/debian/changelog
index 2473f68..533b004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ debian-edu-artwork (0.0.11~1) unstable; urgency=low
   * Add code to debian-edu-artwork.postinst 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
 

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