[debian-edu-commits] debian-edu/ 75/437: * Clean up package removal code.

[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 51ca92d1f1536ffc2f0468a7193b2b624dd2325a
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Sep 14 20:53:55 2006 +0000

      * Clean up package removal code.
---
 debian/changelog                 |  6 ++++++
 debian/debian-edu-artwork.postrm | 32 --------------------------------
 debian/update-artwork            | 22 +++++++++++++++++++++-
 3 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d634ff..25a3a6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-edu-artwork (0.0.11~1) unstable; urgency=low
+
+  * Clean up package removal code.
+
+ -- Petter Reinholdtsen <pere at localhost>  Thu, 14 Sep 2006 22:52:53 +0200
+
 debian-edu-artwork (0.0.10) unstable; urgency=low
 
   * Change usplash text area color to white on black.  Change progress
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
deleted file mode 100644
index 4f4734e..0000000
--- a/debian/debian-edu-artwork.postrm
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-set -e
-
-#DEBHELPER#
-
-editini=/usr/share/debian-edu-artwork/edit-ini
-
-# switch kdm theme away from debian-edu
-restore_kdm_theme() {
-    kdmrc=/etc/kde3/kdm/kdmrc
-    defaulttheme=/usr/share/apps/kdm/themes/circles
-    if grep -q '^Theme=/usr/share/apps/kdm/themes/debian-edu' $kdmrc &&
-	grep -q '^UseTheme=true' $kdmrc; then
-
-        echo "Removing and disabling Debian Edu KDM theme ..."
-	$editini $kdmrc 'X-*-Greeter' UseTheme false
-	$editini $kdmrc 'X-*-Greeter' Theme $defaulttheme
-
-	bgrc=/etc/kde3/kdm/backgroundrc
-	if grep -q '^Wallpaper=debian-edu-wallpaper.png' $bgrc ; then
-	    $editini $bgrc 'Desktop0' Wallpaper debian-kde_default.png
-	fi
-    else
-        echo "KDM theme customised or not enabled, not touching kdmrc ..."
-    fi
-}
-
-case "$1" in
-  remove|deconfigure|failed-upgrade)
-    restore_kdm_theme
-  ;;
-esac
diff --git a/debian/update-artwork b/debian/update-artwork
index 3baceb9..2c437fb 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -45,13 +45,33 @@ change_kdm_theme() {
     fi
 }
 
+# switch kdm theme away from debian-edu
+restore_kdm_theme() {
+    kdmrc=/etc/kde3/kdm/kdmrc
+    defaulttheme=/usr/share/apps/kdm/themes/circles
+    if grep -q '^Theme=/usr/share/apps/kdm/themes/debian-edu' $kdmrc &&
+	grep -q '^UseTheme=true' $kdmrc; then
+
+        echo "Removing and disabling Debian Edu KDM theme ..."
+	$editini $kdmrc 'X-*-Greeter' UseTheme false
+	$editini $kdmrc 'X-*-Greeter' Theme $defaulttheme
+
+	bgrc=/etc/kde3/kdm/backgroundrc
+	if grep -q '^Wallpaper=debian-edu-wallpaper.png' $bgrc ; then
+	    $editini $bgrc 'Desktop0' Wallpaper debian-kde_default.png
+	fi
+    else
+        echo "KDM theme customised or not enabled, not touching kdmrc ..."
+    fi
+}
+
 case "$1" in
   configure)
     change_ldm_background
     change_kdm_theme
     ;;
   remove)
-    #restore_kdm_theme
+    restore_kdm_theme
     #restore_ldm_background
     ;;
 esac

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