[debian-edu-commits] debian-edu/ 55/437: Fix code to activate kdm theme.

[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 8cf825caef0cb072becccdba173e68709190f423
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 3 09:44:47 2006 +0000

    Fix code to activate kdm theme.
---
 debian/changelog                   |  4 +++-
 debian/control                     |  3 ++-
 debian/debian-edu-artwork.postinst | 14 +++++---------
 debian/debian-edu-artwork.postrm   |  8 +++++---
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 73617c2..e1448ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 debian-edu-artwork (0.0.6) UNRELEASED; urgency=low
 
-  * Add kdm theme based on the kubuntu kdm theme.
+  * Add kdm theme based on the kubuntu kdm theme. Depend on
+    debian-edu-config to have /usr/bin/update-ini-file available
+    for kdmrc editing.  Recommend kdm.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun,  3 Sep 2006 11:11:26 +0200
 
diff --git a/debian/control b/debian/control
index a500c33..b4ea254 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Standards-Version: 3.7.2
 
 Package: debian-edu-artwork
 Architecture: all
-Recommends: debian-edu-artwork-usplash
+Depends: debian-edu-config
+Recommends: kdm, debian-edu-artwork-usplash
 Suggests: grub (>= 0.95+cvs20040624-10)
 Description: Debian-Edu themes and artwork
  This package contains Debian-Edu themes and artwork.
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index 8e659cb..bb050ad 100644
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -21,22 +21,18 @@ change_kde_background() {
     fi
 }
 
-change_kdm_background() {
+change_kdm_theme() {
     # switch kdm theme to debian-edu
-    if grep -q '^Theme=/usr/share/apps/kdm/themes/debian-edu' /etc/kde3/kdm/kdmrc &&
- grep -q '^UseTheme=false' /etc/kde3/kdm/kdmrc; then
-        sed -i -e 's/UseTheme=false/UseTheme=true/' /etc/kde3/kdm/kdmrc
-        echo "Installing and enabling Debian Edu KDM theme ..."
-    else
-        echo "KDM theme customised or already enabled, not touching kdmrc ..."
-    fi
-
+    /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
 }
 
 case "$1" in
   configure)
     change_ldm_background
 
+    change_kdm_theme
+
     # Need to get this working
     #change_kde_background
     ;;
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index 109b42b..877a701 100644
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -7,10 +7,12 @@ 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 &&
-       grep -q '^UseTheme=true' /etc/kde3/kdm/kdmrc; then
-        sed -i -e 's/UseTheme=true/UseTheme=false/' /etc/kde3/kdm/kdmrc
+	/etc/kde3/kdm/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
     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