[debian-edu-commits] debian-edu/ 122/437: * Update default settings used when restoring the old kdm configuration to match the current defaults in kdm from version 3.5.5a.dfsg.1-6.

[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 5a500d00a9843d244443c5c8b068e876d5545bb6
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Jul 4 12:51:32 2007 +0000

      * Update default settings used when restoring the old kdm configuration
        to match the current defaults in kdm from version 3.5.5a.dfsg.1-6.
---
 debian/changelog      | 2 ++
 debian/update-artwork | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa01d31..bd930e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debian-edu-artwork (0.0.18.0.edu.etch.1) terra; urgency=low
 
   * Change how kdm is configured to use the new /etc/default/kdm.d/
     method instead of the policy breaking editing during postinst.
+  * Update default settings used when restoring the old kdm configuration
+    to match the current defaults in kdm from version 3.5.5a.dfsg.1-6.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed,  4 Jul 2007 09:42:04 +0200
 
diff --git a/debian/update-artwork b/debian/update-artwork
index 51f7447..dc87698 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -48,7 +48,8 @@ change_kdm_theme() {
 
 # switch kdm theme away from debian-edu
 restore_kdm_theme() {
-    defaulttheme=/usr/share/apps/kdm/themes/circles
+    defaulttheme=@@@ToBeReplacedByDesktopBase@@@
+    defaultwallpaper=default_blue.jpg
     if [ -f $kdmrc ] ; then
 	if grep -q '^Theme=/usr/share/apps/kdm/themes/debian-edu' $kdmrc &&
 	    grep -q '^UseTheme=true' $kdmrc; then
@@ -59,7 +60,7 @@ restore_kdm_theme() {
 
 	    bgrc=/etc/kde3/kdm/backgroundrc
 	    if grep -q '^Wallpaper=debian-edu-wallpaper.png' $bgrc ; then
-		$editini $bgrc 'Desktop0' Wallpaper debian-kde_default.png
+		$editini $bgrc 'Desktop0' Wallpaper $defaultwallpaper
 	    fi
 	else
 	    echo "KDM theme customised or not enabled, not touching kdmrc ..."

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