Merge lp:~jdstrand/firefox/firefox-436221 into lp:firefox/3.5

[Jamie Strandboge]

[Jamie Strandboge (jdstrand)]

Fix for bug #436221. Changelog has entries from other pending merge proposals.

[Alexander Sack (asac)]

i cherry picked for beta:
+ disable profile on upgrades from earlier Ubuntu releases (LP: #436221)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-14 14:26:58 +0000
+++ debian/changelog	2009-09-24 22:35:17 +0000
@@ -37,13 +37,17 @@
       - update debian/rules
 
   [ Jamie Strandboge <[e-mail]> ]
-  * fix bugs sourrounding apparmor profile
-    + allow gnash (LP: #429061)
+  * fix bugs surrounding apparmor profile
+    + allow ixr access to gnash (LP: #429061)
+    + allow ixr access to pulseaudio (LP: #432702)
     + allow access to plugins directory (LP: #428071)
+    + allow access to mounted media (LP: #433362)
     + allow access to abstractions/ubuntu-console-email,
       abstractions/ubuntu-email and abstractions/ubuntu-gnome-terminal
       for mailto:. Add commented section for using xterm and konsole
       - update debian/usr.bin.firefox-3.5
+    + allow access to extensions directories (LP: #433128)
+    + disable profile on upgrades from earlier Ubuntu releases (LP: #436221)
 
  -- Fabien Tassin <[e-mail]>  Sat, 05 Sep 2009 19:30:29 +0200
 
 
=== modified file 'debian/firefox-3.5.preinst.in'
--- debian/firefox-3.5.preinst.in	2009-09-03 01:57:48 +0000
+++ debian/firefox-3.5.preinst.in	2009-09-24 22:35:17 +0000
@@ -9,7 +9,7 @@
     # Disable AppArmor profile on install or upgrade from earlier than when we
     # first shipped the profile if the user does not already have a profile
     # defined
-    if dpkg --compare-versions "$2" lt 3.5.2+nobinonly-0ubuntu3 ; then
+    if dpkg --compare-versions "$2" lt 3.5.2+nobinonly-0ubuntu3 || echo "$2" | egrep -q '(9.04|8.10|8.04)' ; then
         if [ ! -e "$APP_CONFFILE" ]; then
             mkdir -p `dirname $APP_DISABLE` 2>/dev/null || true
             ln -sf $APP_CONFFILE $APP_DISABLE