Mozilla Firefox

Merge lp:~jdstrand/firefox/firefox-452591+455792+447006 into lp:firefox/3.5

  1. firefox-452591+455792+447006
  2. Merge into firefox-3.5.head
Proposed by Jamie Strandboge
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jdstrand/firefox/firefox-452591+455792+447006
Merge into: lp:firefox/3.5
Diff against target: 55 lines
2 files modified
debian/changelog (+9/-1)
debian/usr.bin.firefox.apparmor.in (+4/-0)
To merge this branch: bzr merge lp:~jdstrand/firefox/firefox-452591+455792+447006
Reviewer Review Type Date Requested Status
Mozilla Team Pending
Review via email: mp+14109@code.launchpad.net
To post a comment you must log in.

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-10-20 22:12:27 +0000
3+++ debian/changelog 2009-10-28 20:40:22 +0000
4@@ -1,5 +1,6 @@
5 firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu7) UNRELEASED; urgency=low
6
7+ [ Alexander Sack <asac@ubuntu.com> ]
8 * use awesome-browser-branch-3.5 during tarball creation
9 - update debian/mozclient/firefox-3.5.conf
10 * drop branding patch for lp:396156 as new upstream tarballs
11@@ -7,7 +8,14 @@
12 - delete debian/patches/lp396156_prepatch_abrowser_branding.patch
13 - update debian/patches/series
14
15- -- Alexander Sack <asac@ubuntu.com> Tue, 20 Oct 2009 22:46:16 +0200
16+ [ Jamie Strandboge <jamie@ubuntu.com> ]
17+ * apparmor fixes:
18+ - allow access to nautilus, to allow "Open containing folder" to work
19+ (LP: #452591)
20+ - allow access for deluge (LP: #455792)
21+ - add kde abstration (LP: #447006)
22+
23+ -- Jamie Strandboge <jamie@ubuntu.com> Wed, 28 Oct 2009 14:39:14 -0500
24
25 firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu6) karmic; urgency=low
26
27
28=== modified file 'debian/usr.bin.firefox.apparmor.in'
29--- debian/usr.bin.firefox.apparmor.in 2009-10-15 00:30:36 +0000
30+++ debian/usr.bin.firefox.apparmor.in 2009-10-28 20:40:22 +0000
31@@ -12,6 +12,7 @@
32 #include <abstractions/fonts>
33 #include <abstractions/freedesktop.org>
34 #include <abstractions/gnome>
35+ #include <abstractions/kde>
36 #include <abstractions/nameservice>
37 #include <abstractions/user-tmp>
38 #include <abstractions/X>
39@@ -129,6 +130,7 @@
40 /bin/ps Uxr,
41 /bin/uname Uxr,
42 /usr/bin/m4 ixr,
43+ /usr/bin/mkfifo Uxr,
44 /usr/lib/nspluginwrapper/i386/linux/npviewer Uxr,
45 /var/lib/ r,
46 /var/lib/** mr,
47@@ -157,6 +159,8 @@
48 /usr/bin/oowriter Uxr,
49 /usr/bin/gtk-gnash ixr,
50 /usr/bin/pulseaudio ixr,
51+ /usr/bin/nautilus Uxr,
52+ /usr/bin/deluge Uxr,
53
54 # totem
55 /usr/lib/totem/** ixr,

Subscribers

People subscribed via source and target branches