diff -u evolution-indicator-0.2.4/debian/changelog evolution-indicator-0.2.4/debian/changelog
--- evolution-indicator-0.2.4/debian/changelog
+++ evolution-indicator-0.2.4/debian/changelog
@@ -1,16 +1,37 @@
-evolution-indicator (0.2.4-0ubuntu2) karmic; urgency=low
+evolution-indicator (0.2.4-0ubuntu5) lucid; urgency=low
 
-  * debian/postinst:
-    - use a preinst rather and do some tweaking
-     
+  * debian/rules:
+    - use the upstream evolution desktop entry there
+    
   [ Ken VanDine ]
+  * debian/preinst:
+    - fixed the version compare to be friendly on new installs
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 17 Dec 2009 10:56:28 +0100
+
+evolution-indicator (0.2.4-0ubuntu4) karmic-proposed; urgency=low
+
+  * debian/rules: use simple-patchsys.mk so the previous change does something
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 02 Dec 2009 10:03:08 +0100
+
+evolution-indicator (0.2.4-0ubuntu3) karmic-proposed; urgency=low
+
+  * debian/patches/01_fix_pop3_notifications.patch
+    - Pull revision 55 from trunk to fix notifications for POP3 accounts by
+      adding a indicator for the default Inbox. (LP: #436755)
+
+ -- Neil J. Patel <neil.patel@canonical.com>  Fri, 20 Nov 2009 08:23:06 -0600
+
+evolution-indicator (0.2.4-0ubuntu2) karmic; urgency=low
+
   * debian/rules: 
     - Moved the indicator launcher to /usr/share (LP: #434097) 
   * debian/postinst:
     - remove the old indicator from /etc and remove the directory 
       if it is empty
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 24 Sep 2009 23:46:51 +0200
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 24 Sep 2009 15:14:30 -0400
 
 evolution-indicator (0.2.4-0ubuntu1) karmic; urgency=low
 
diff -u evolution-indicator-0.2.4/debian/preinst evolution-indicator-0.2.4/debian/preinst
--- evolution-indicator-0.2.4/debian/preinst
+++ evolution-indicator-0.2.4/debian/preinst
@@ -2,8 +2,8 @@
 
 case $1 in
     install|upgrade)
-	    if dpkg --compare-versions "$2" le "0.2.4-0ubuntu1"; then
-            rm /etc/indicators/messages/applications/evolution || true
+	if dpkg --compare-versions "$2" lt-nl "0.2.4-0ubuntu1"; then
+            rm "/etc/indicators/messages/applications/evolution" || true
             rmdir --ignore-fail-on-non-empty "/etc/indicators/messages/applications/" || true
         fi
         ;;
diff -u evolution-indicator-0.2.4/debian/rules evolution-indicator-0.2.4/debian/rules
--- evolution-indicator-0.2.4/debian/rules
+++ evolution-indicator-0.2.4/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
 # do not generate ldconfig maintainer script stuff
@@ -14 +15 @@
-	echo /usr/share/applications/evolution-mail.desktop > debian/$(cdbs_curpkg)/usr/share/indicators/messages/applications/evolution
+	echo /usr/share/applications/evolution.desktop > debian/$(cdbs_curpkg)/usr/share/indicators/messages/applications/evolution