Mozilla Firefox

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

  1. firefox-439484
  2. Merge into firefox-3.5.head
Proposed by Jamie Strandboge
Status: Merged
Approved by: Alexander Sack
Approved revision: 475
Merged at revision: not available
Proposed branch: lp:~jdstrand/firefox/firefox-439484
Merge into: lp:firefox/3.5
Diff against target: 25 lines
2 files modified
debian/changelog (+1/-0)
debian/usr.bin.firefox.apparmor.in (+3/-0)
To merge this branch: bzr merge lp:~jdstrand/firefox/firefox-439484
Reviewer Review Type Date Requested Status
Alexander Sack (community) Approve
Review via email: mp+13355@code.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 16:15:25 +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 access to /etc/mplayerplug-in.conf (LP: #439484)
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 16:15:25 +0000
16@@ -166,6 +166,9 @@
17 # mozplugger
18 /etc/mozpluggerrc r,
19 /usr/bin/mozplugger-helper Uxr,
20+
21+ # mplayer plugin
22+ /etc/mplayerplug-in.conf r,
23 /usr/bin/mplayer Uxr,
24
25 # java

Subscribers

People subscribed via source and target branches