[debian-edu-commits] debian-edu/ 56/437: Make sure the kdm theme is enabled.

[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 c0b53ff5bc4c4b3da4c73ca457d1ab7302855498
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 3 10:15:45 2006 +0000

    Make sure the kdm theme is enabled.
---
 debian/debian-edu-artwork.postinst | 7 +++++--
 debian/debian-edu-artwork.postrm   | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index bb050ad..e4bce0b 100644
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -23,8 +23,11 @@ change_kde_background() {
 
 change_kdm_theme() {
     # switch kdm theme to debian-edu
-    /usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' GreetString 'Debian Edu (%n)'
-    /usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' Theme /usr/share/apps/kdm/themes/debian-edu
+    kdmrc=/etc/kde3/kdm/kdmrc
+    echo "Installing and enabling Debian Edu KDM theme ..."
+    /usr/bin/update-ini-file $kdmrc 'X-*-Greeter' GreetString 'Debian Edu (%n)'
+    /usr/bin/update-ini-file $kdmrc 'X-*-Greeter' Theme /usr/share/apps/kdm/themes/debian-edu
+    /usr/bin/update-ini-file $kdmrc 'X-*-Greeter' UseTheme true
 }
 
 case "$1" in
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index 877a701..9af1739 100644
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -6,13 +6,15 @@ set -e
 case "$1" in
   remove|deconfigure|failed-upgrade)
     # switch kdm theme away from debian-edu
-    if grep -q '^Theme=/usr/share/apps/kdm/themes/debian-edu' \
-	/etc/kde3/kdm/kdmrc ; then
+    kdmrc=/etc/kde3/kdm/kdmrc
+    if grep -q '^Theme=/usr/share/apps/kdm/themes/debian-edu' $kdmrc
+	&& grep -q '^UseTheme=false' $kdmrc; then
 
         echo "Removing and disabling Debian Edu KDM theme ..."
 
 	/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' GreetString 'Debian (%n)'
 	/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' Theme /usr/share/apps/kdm/themes/cirles
+	/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' UseTheme false
     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