Bug#501973: enigmail: diff for NMU version 2:0.95.0+1-3.2

[Torsten Werner]

Package: enigmail
Version: 2:0.95.0+1-3.1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my enigmail 2:0.95.0+1-3.2 NMU.

Cheers,
Torsten

diff -u enigmail-0.95.0+1/debian/changelog enigmail-0.95.0+1/debian/changelog
--- enigmail-0.95.0+1/debian/changelog
+++ enigmail-0.95.0+1/debian/changelog
@@ -1,3 +1,12 @@
+enigmail (2:0.95.0+1-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix preinst to make sure the upgrade from old version actually works.
+    (Closes: #486491, #468954)
+  * Add missing #DEBHELPER# token to preinst.
+
+ -- Torsten Werner <[EMAIL PROTECTED]>  Sun, 12 Oct 2008 13:28:24 +0200
+
 enigmail (2:0.95.0+1-3.1) unstable; urgency=low
 
   * Non-maintainer upload to fix a long-standing RC bug in Debian.
diff -u enigmail-0.95.0+1/debian/enigmail.preinst enigmail-0.95.0+1/debian/enigmail.preinst
--- enigmail-0.95.0+1/debian/enigmail.preinst
+++ enigmail-0.95.0+1/debian/enigmail.preinst
@@ -6,17 +6,8 @@
-    if test ! -d /usr/lib/enigmail/extension/; then
-      mkdir -p /usr/lib/enigmail/
-      cp -r  '/usr/lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}' /usr/lib/enigmail/extension
-    else
-      rm -rf '/usr/lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}'
-    fi
+    rm -rf '/usr/lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}'
   fi
   if test -d '/usr/lib/icedove/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}'; then
-    if test ! -d /usr/lib/enigmail/extension/; then
-      mkdir -p /usr/lib/enigmail/
-      cp -r  '/usr/lib/icedove/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}' /usr/lib/enigmail/extension
-    else
-      rm -rf '/usr/lib/icedove/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}'
-    fi
+    rm -rf '/usr/lib/icedove/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}'
   fi
 fi
 
+#DEBHELPER#