Mozilla Firefox

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

  1. firefox-436221
  2. Merge into firefox-3.5.head
Proposed by Jamie Strandboge
Status: Merged
Merge reported by: Alexander Sack
Merged at revision: not available
Proposed branch: lp://staging/~jdstrand/firefox/firefox-436221
Merge into: lp://staging/firefox/3.5
Diff against target: 36 lines
2 files modified
debian/changelog (+6/-2)
debian/firefox-3.5.preinst.in (+1/-1)
To merge this branch: bzr merge lp://staging/~jdstrand/firefox/firefox-436221
Reviewer Review Type Date Requested Status
Alexander Sack (community) Approve
Review via email: mp+12390@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

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

Revision history for this message
Alexander Sack (asac) wrote :

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

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches