From f3aaf2871659e84609dcde431401020b2342c3c1 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Wed, 29 Sep 2010 00:18:58 +0200
Subject: [PATCH] Revert r81

---
 debian/changelog | 2 --
 debian/prerm     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8b882d..c2b3c86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ lubuntu-default-settings (0.11~ppa1) maverick; urgency=low
    - Use lxtask instead of xfce4-taskmanager (LP: #621317)
   * etc/xdg/lxsession/Lubuntu*/desktop.conf
    - Switch to lubuntu icon them.
-  * debian/prerm:
-   - Don't remove alternative on upgrade (LP: #625485)
   * debian/control:
    - Depends on lubuntu-icon-theme.
 
diff --git a/debian/prerm b/debian/prerm
index 23ea4bd..297ce34 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$1" = "remove" ]; then
+if [ "$1" = "remove" ] || [ "$1" = upgrade ]; then
   update-alternatives --remove lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 
 fi