Merge lp://qastaging/~jdstrand/firefox/firefox-449286 into lp://qastaging/firefox/3.5

Proposed by Jamie Strandboge
Status: Merged
Approved by: Alexander Sack
Approved revision: 475
Merged at revision: not available
Proposed branch: lp://qastaging/~jdstrand/firefox/firefox-449286
Merge into: lp://qastaging/firefox/3.5
Diff against target: 24 lines
2 files modified
debian/changelog (+1/-0)
debian/usr.bin.firefox.apparmor.in (+1/-1)
To merge this branch: bzr merge lp://qastaging/~jdstrand/firefox/firefox-449286
Reviewer Review Type Date Requested Status
Alexander Sack (community) Approve
Review via email: mp+13344@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Sack (asac) :
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-30 09:57:11 +0000
3+++ debian/changelog 2009-10-14 14:05:18 +0000
4@@ -47,6 +47,7 @@
5 for mailto:. Add commented section for using xterm and konsole
6 - update debian/usr.bin.firefox-3.5
7 + allow access to extensions directory (LP: #433128)
8+ + allow 'k' access to @{HOME}/.mozilla/**/*.sqlite* (LP: #449286)
9
10 -- Fabien Tassin <fta@ubuntu.com> Sat, 05 Sep 2009 19:30:29 +0200
11
12
13=== modified file 'debian/usr.bin.firefox.apparmor.in'
14--- debian/usr.bin.firefox.apparmor.in 2009-09-25 15:13:07 +0000
15+++ debian/usr.bin.firefox.apparmor.in 2009-10-14 14:05:18 +0000
16@@ -91,7 +91,7 @@
17 # per-user firefox configuration
18 @{HOME}/.mozilla/ rw,
19 @{HOME}/.mozilla/** rw,
20- @{HOME}/.mozilla/**/*.sqlite k,
21+ @{HOME}/.mozilla/**/*.sqlite* k,
22 @{HOME}/.mozilla/**/.parentlock k,
23 @{HOME}/.mozilla/plugins/** rm,
24 @{HOME}/.mozilla/**/plugins/** rm,

Subscribers

People subscribed via source and target branches