[debian-edu-commits] debian-edu/ 69/437: * Only activate KDM theme if KDM is installed.

[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 d5073c119dc574ddf51a8ad0bbc22409c354d547
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Sep 4 20:19:07 2006 +0000

      * Only activate KDM theme if KDM is installed.
---
 debian/changelog                   |  6 ++++++
 debian/debian-edu-artwork.postinst | 32 +++++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b53f8a4..df72d09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-edu-artwork (0.0.9) UNRELEASED; urgency=low
+
+  * Only activate KDM theme if KDM is installed.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sun,  3 Sep 2006 16:01:49 +0200
+
 debian-edu-artwork (0.0.8) unstable; urgency=low
 
   * Avoid switching background image during login, by setting the KDM
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index 1ebe0cd..4f7a443 100644
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -19,19 +19,29 @@ change_kdm_theme() {
 	    echo "KDM theme already customized, not touching kdmrc."
 	fi
     else
-	echo "Installing and enabling Debian Edu 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.
-	# See also http://release.debian.org/etch_rc_policy.txt
+	if [ -f $kdmrc ] ; then
+	    echo "Installing and enabling Debian Edu 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.  See also
+            # http://release.debian.org/etch_rc_policy.txt
 
-	# First update the KDM theme
-	/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
+            # First update the KDM theme
+	    /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
 
-	# Next, update the background used after the KDM theme is
-	# removed and before kdesktop insert the selected background.
-	/usr/bin/update-ini-file /etc/kde3/kdm/backgroundrc 'Desktop0' Wallpaper debian-edu-wallpaper.png
+            # Next, update the background used after the KDM theme is
+            # removed and before kdesktop insert the selected background.
+	    bgrc=/etc/kde3/kdm/backgroundrc
+	    if [ -f $bgrc ] ; then
+		/usr/bin/update-ini-file $bgrc 'Desktop0' Wallpaper \
+		    debian-edu-wallpaper.png
+	    fi
+	else
+	    echo "KDM not installed, not enabling KDM theme."
+	fi
     fi
 }
 

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