Mozilla Firefox

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

  1. firefox-452591+455792+447006+464016+473268
  2. Merge into firefox-3.5.head
Proposed by Jamie Strandboge
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~jdstrand/firefox/firefox-452591+455792+447006+464016+473268
Merge into: lp://qastaging/firefox/3.5
Diff against target: 104 lines (+34/-1)
2 files modified
debian/changelog (+22/-0)
debian/usr.bin.firefox.apparmor.in (+12/-1)
To merge this branch: bzr merge lp://qastaging/~jdstrand/firefox/firefox-452591+455792+447006+464016+473268
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+14392@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

I would like to get these into an SRU for karmic.

lp://qastaging/~jdstrand/firefox/firefox-452591+455792+447006+464016+473268 updated
493. By Jamie Strandboge

  - work better with KDE by adding kde abstraction, allow access to soffice,
    allow access to okular and read access to /etc/fstab (for print dialog)
    (LP: #447006)
  - allow access to soffice

494. By Jamie Strandboge

remove extra entry in changelog

495. By Jamie Strandboge

allow access to transmission (LP: #476299)

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-11-09 11:35:34 +0000
3+++ debian/changelog 2009-11-09 22:25:21 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 firefox-3.5 (3.5.5+nobinonly-0ubuntu2) lucid; urgency=low
7
8 * New upstream release v3.5.5 (FIREFOX_3_5_5_RELEASE)
9@@ -11,6 +12,11 @@
10 - see USN-853-1
11
12 [ Alexander Sack <asac@ubuntu.com> ]
13+=======
14+firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu7) UNRELEASED; urgency=low
15+
16+ [ Alexander Sack <asac@ubuntu.com> ]
17+>>>>>>> MERGE-SOURCE
18 * use awesome-browser-branch-3.5 during tarball creation
19 - update debian/mozclient/firefox-3.5.conf
20 * drop branding patch for lp:396156 as new upstream tarballs
21@@ -18,6 +24,7 @@
22 - delete debian/patches/lp396156_prepatch_abrowser_branding.patch
23 - update debian/patches/series
24
25+<<<<<<< TREE
26 [ Fabien Tassin <fta@ubuntu.com> ]
27 * Don't enable the AppArmor profile by default for backports coming
28 from the Mozilla daily PPA. It's still possible for users to
29@@ -25,6 +32,21 @@
30 - update debian/firefox-3.5.preinst.in
31
32 -- Alexander Sack <asac@ubuntu.com> Mon, 09 Nov 2009 11:21:28 +0100
33+=======
34+ [ Jamie Strandboge <jamie@ubuntu.com> ]
35+ * apparmor fixes:
36+ - allow access to nautilus, to allow "Open containing folder" to work
37+ (LP: #452591)
38+ - allow access for deluge (LP: #455792)
39+ - work better with KDE by adding kde abstraction, allow access to soffice,
40+ allow access to okular and read access to /etc/fstab (for print dialog)
41+ (LP: #447006)
42+ - allow access to acroread (LP: #473268)
43+ - allow access to eog (LP: #464016)
44+ - allow access to transmission (LP: #476299)
45+
46+ -- Jamie Strandboge <jamie@ubuntu.com> Wed, 28 Oct 2009 14:39:14 -0500
47+>>>>>>> MERGE-SOURCE
48
49 firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu6) karmic; urgency=low
50
51
52=== modified file 'debian/usr.bin.firefox.apparmor.in'
53--- debian/usr.bin.firefox.apparmor.in 2009-10-15 00:30:36 +0000
54+++ debian/usr.bin.firefox.apparmor.in 2009-11-09 22:25:21 +0000
55@@ -12,6 +12,7 @@
56 #include <abstractions/fonts>
57 #include <abstractions/freedesktop.org>
58 #include <abstractions/gnome>
59+ #include <abstractions/kde>
60 #include <abstractions/nameservice>
61 #include <abstractions/user-tmp>
62 #include <abstractions/X>
63@@ -61,6 +62,7 @@
64 capability sys_ptrace,
65
66 /etc/mtab r,
67+ /etc/fstab r,
68 @{PROC}/[0-9]*/mounts r,
69 @{PROC}/[0-9]*/maps r,
70
71@@ -129,6 +131,7 @@
72 /bin/ps Uxr,
73 /bin/uname Uxr,
74 /usr/bin/m4 ixr,
75+ /usr/bin/mkfifo Uxr,
76 /usr/lib/nspluginwrapper/i386/linux/npviewer Uxr,
77 /var/lib/ r,
78 /var/lib/** mr,
79@@ -146,7 +149,7 @@
80 /usr/bin/evince PUxr,
81
82 # miscellaneous
83- #/usr/bin/eog Uxr,
84+ /usr/bin/eog Uxr,
85 /usr/bin/gedit Uxr,
86 /usr/bin/gimp* Uxr,
87 /usr/bin/file-roller Uxr,
88@@ -155,8 +158,16 @@
89 /usr/bin/oodraw Uxr,
90 /usr/bin/ooimpress Uxr,
91 /usr/bin/oowriter Uxr,
92+ /usr/lib/openoffice/program/soffice Uxr,
93 /usr/bin/gtk-gnash ixr,
94 /usr/bin/pulseaudio ixr,
95+ /usr/bin/nautilus Uxr,
96+ /usr/bin/deluge Uxr,
97+ /usr/bin/okular Uxr,
98+ /usr/bin/transmission Uxr,
99+
100+ # Adobe Acrobat Reader
101+ /opt/Adobe/Reader9/bin/acroread Uxr,
102
103 # totem
104 /usr/lib/totem/** ixr,

Subscribers

People subscribed via source and target branches