diff -u thunderbird-3.1.2+nobinonly/debian/changelog thunderbird-3.1.2+nobinonly/debian/changelog
--- thunderbird-3.1.2+nobinonly/debian/changelog
+++ thunderbird-3.1.2+nobinonly/debian/changelog
@@ -1,4 +1,4 @@
-thunderbird (3.1.2+nobinonly-0ubuntu1~lucid~ppa1) lucid; urgency=low
+thunderbird (3.1.2+nobinonly-0ubuntu1~lucid~ppa2) lucid; urgency=low
 
   * New upstream release v3.1.2 (THUNDERBIRD_3_1_2_RELEASE)
 
@@ -15,8 +15,11 @@
     - update debian/patches/fix_installdir.patch
   * Update thunderbird.install for 3.1.x files
     - update debian/thunderbird.install
+  * Add patch for directory symlinks breaking extensions
+    - add debian/patches/lp518422.patch
+    - update debian/patches/series
 
- -- Micah Gersten <micahg@ubuntu.com>  Sun, 08 Aug 2010 07:24:12 -0500
+ -- Micah Gersten <micahg@ubuntu.com>  Thu, 19 Aug 2010 00:35:24 -0500
 
 thunderbird (3.0.6+build2+nobinonly-0ubuntu1) maverick; urgency=low
 
diff -u thunderbird-3.1.2+nobinonly/debian/patches/series thunderbird-3.1.2+nobinonly/debian/patches/series
--- thunderbird-3.1.2+nobinonly/debian/patches/series
+++ thunderbird-3.1.2+nobinonly/debian/patches/series
@@ -7,0 +8 @@
+lp518422.patch
only in patch2:
unchanged:
--- thunderbird-3.1.2+nobinonly.orig/debian/patches/lp518422.patch
+++ thunderbird-3.1.2+nobinonly/debian/patches/lp518422.patch
@@ -0,0 +1,25 @@
+diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+--- a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
++++ b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+@@ -628,20 +628,17 @@ IndexOfDirectoryOfFile(nsISupportsArray*
+         aSearchPath->Count(&count);
+         NS_ASSERTION(count, "broken search path! bad count");
+         for(PRUint32 i = 0; i < count; i++)
+         {
+             nsCOMPtr<nsIFile> current;
+             aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), 
+                                         getter_AddRefs(current));
+             NS_ASSERTION(current, "broken search path! bad element");
+-            // nsIFile::Equals basically compares path strings so normalize
+-            // before the comparison.
+-            parent->Normalize();
+-            current->Normalize();
++
+             PRBool same;
+             if (NS_SUCCEEDED(parent->Equals(current, &same)) && same)
+                 return (int) i;
+         }
+     }
+     NS_ERROR("file not in search directory!");
+     return -1;
+ }