[debian-edu-commits] debian-edu/ 64/437: * Remember to run autoreconf, to make sure kdesktoprc is installed in the correct location. * Add some notes about the policy related status of the kdm theme enabling code. See bug #385849 as well.

[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 4cdff4520994bfa2633825ebed7c6b6a5d3b9922
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 3 12:41:56 2006 +0000

       * Remember to run autoreconf, to make sure kdesktoprc is installed
         in the correct location.
       * Add some notes about the policy related status of the kdm theme
         enabling code.  See bug #385849 as well.
---
 art/kde/Makefile.in                | 2 +-
 debian/debian-edu-artwork.postinst | 3 ++-
 debian/debian-edu-artwork.postrm   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/art/kde/Makefile.in b/art/kde/Makefile.in
index 42c0bd2..499fe8a 100644
--- a/art/kde/Makefile.in
+++ b/art/kde/Makefile.in
@@ -145,7 +145,7 @@ kdeimgdir = $(datadir)/wallpapers
 kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
 Xsessiondir = /etc/X11/Xsession.d/
 Xsession_SCRIPTS = 25debian-edu-artwork
-kdedefaultdir = /usr/share/debian-edu-artwork/kde-profile/default
+kdedefaultdir = /usr/share/debian-edu-artwork/kde-profile/share/config
 kdedefault_DATA = kdesktoprc
 EXTRA_DIST = $(kdeimg_DATA) $(Xsession_DATA) $(kdedefault_DATA)
 all: all-am
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index fc04c29..c2bec21 100644
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -23,8 +23,9 @@ change_kdm_theme() {
 	# This is not policy compilant, as $kdmrc is a conffile in the
 	# kdm package, and we are editing it in a package maintainer
 	# script.  Need to come up with a better way to do it.
-	/usr/bin/update-ini-file $kdmrc 'X-*-Greeter' Theme /usr/share/apps/kdm/themes/debian-edu
+	# See also http://release.debian.org/etch_rc_policy.txt
 	/usr/bin/update-ini-file $kdmrc 'X-*-Greeter' UseTheme true
+	/usr/bin/update-ini-file $kdmrc 'X-*-Greeter' Theme /usr/share/apps/kdm/themes/debian-edu
     fi
 }
 
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index 7e25377..2975fa4 100644
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -11,8 +11,8 @@ restore_kdm_theme() {
 	grep -q '^UseTheme=true' $kdmrc; then
 
         echo "Removing and disabling Debian Edu KDM theme ..."
-	/usr/bin/update-ini-file $kdmrc 'X-*-Greeter' Theme $defaulttheme
 	/usr/bin/update-ini-file $kdmrc 'X-*-Greeter' UseTheme false
+	/usr/bin/update-ini-file $kdmrc 'X-*-Greeter' Theme $defaulttheme
     else
         echo "KDM theme customised or not enabled, not touching kdmrc ..."
     fi

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