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
=== modified file 'debian/changelog'
--- debian/changelog 2009-11-09 11:35:34 +0000
+++ debian/changelog 2009-11-09 22:25:21 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1firefox-3.5 (3.5.5+nobinonly-0ubuntu2) lucid; urgency=low2firefox-3.5 (3.5.5+nobinonly-0ubuntu2) lucid; urgency=low
23
3 * New upstream release v3.5.5 (FIREFOX_3_5_5_RELEASE)4 * New upstream release v3.5.5 (FIREFOX_3_5_5_RELEASE)
@@ -11,6 +12,11 @@
11 - see USN-853-112 - see USN-853-1
1213
13 [ Alexander Sack <asac@ubuntu.com> ]14 [ Alexander Sack <asac@ubuntu.com> ]
15=======
16firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu7) UNRELEASED; urgency=low
17
18 [ Alexander Sack <asac@ubuntu.com> ]
19>>>>>>> MERGE-SOURCE
14 * use awesome-browser-branch-3.5 during tarball creation20 * use awesome-browser-branch-3.5 during tarball creation
15 - update debian/mozclient/firefox-3.5.conf21 - update debian/mozclient/firefox-3.5.conf
16 * drop branding patch for lp:396156 as new upstream tarballs22 * drop branding patch for lp:396156 as new upstream tarballs
@@ -18,6 +24,7 @@
18 - delete debian/patches/lp396156_prepatch_abrowser_branding.patch24 - delete debian/patches/lp396156_prepatch_abrowser_branding.patch
19 - update debian/patches/series25 - update debian/patches/series
2026
27<<<<<<< TREE
21 [ Fabien Tassin <fta@ubuntu.com> ]28 [ Fabien Tassin <fta@ubuntu.com> ]
22 * Don't enable the AppArmor profile by default for backports coming29 * Don't enable the AppArmor profile by default for backports coming
23 from the Mozilla daily PPA. It's still possible for users to30 from the Mozilla daily PPA. It's still possible for users to
@@ -25,6 +32,21 @@
25 - update debian/firefox-3.5.preinst.in32 - update debian/firefox-3.5.preinst.in
2633
27 -- Alexander Sack <asac@ubuntu.com> Mon, 09 Nov 2009 11:21:28 +010034 -- Alexander Sack <asac@ubuntu.com> Mon, 09 Nov 2009 11:21:28 +0100
35=======
36 [ Jamie Strandboge <jamie@ubuntu.com> ]
37 * apparmor fixes:
38 - allow access to nautilus, to allow "Open containing folder" to work
39 (LP: #452591)
40 - allow access for deluge (LP: #455792)
41 - work better with KDE by adding kde abstraction, allow access to soffice,
42 allow access to okular and read access to /etc/fstab (for print dialog)
43 (LP: #447006)
44 - allow access to acroread (LP: #473268)
45 - allow access to eog (LP: #464016)
46 - allow access to transmission (LP: #476299)
47
48 -- Jamie Strandboge <jamie@ubuntu.com> Wed, 28 Oct 2009 14:39:14 -0500
49>>>>>>> MERGE-SOURCE
2850
29firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu6) karmic; urgency=low51firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu6) karmic; urgency=low
3052
3153
=== modified file 'debian/usr.bin.firefox.apparmor.in'
--- debian/usr.bin.firefox.apparmor.in 2009-10-15 00:30:36 +0000
+++ debian/usr.bin.firefox.apparmor.in 2009-11-09 22:25:21 +0000
@@ -12,6 +12,7 @@
12 #include <abstractions/fonts>12 #include <abstractions/fonts>
13 #include <abstractions/freedesktop.org>13 #include <abstractions/freedesktop.org>
14 #include <abstractions/gnome>14 #include <abstractions/gnome>
15 #include <abstractions/kde>
15 #include <abstractions/nameservice>16 #include <abstractions/nameservice>
16 #include <abstractions/user-tmp>17 #include <abstractions/user-tmp>
17 #include <abstractions/X>18 #include <abstractions/X>
@@ -61,6 +62,7 @@
61 capability sys_ptrace,62 capability sys_ptrace,
6263
63 /etc/mtab r,64 /etc/mtab r,
65 /etc/fstab r,
64 @{PROC}/[0-9]*/mounts r,66 @{PROC}/[0-9]*/mounts r,
65 @{PROC}/[0-9]*/maps r,67 @{PROC}/[0-9]*/maps r,
6668
@@ -129,6 +131,7 @@
129 /bin/ps Uxr,131 /bin/ps Uxr,
130 /bin/uname Uxr,132 /bin/uname Uxr,
131 /usr/bin/m4 ixr,133 /usr/bin/m4 ixr,
134 /usr/bin/mkfifo Uxr,
132 /usr/lib/nspluginwrapper/i386/linux/npviewer Uxr,135 /usr/lib/nspluginwrapper/i386/linux/npviewer Uxr,
133 /var/lib/ r,136 /var/lib/ r,
134 /var/lib/** mr,137 /var/lib/** mr,
@@ -146,7 +149,7 @@
146 /usr/bin/evince PUxr,149 /usr/bin/evince PUxr,
147150
148 # miscellaneous151 # miscellaneous
149 #/usr/bin/eog Uxr,152 /usr/bin/eog Uxr,
150 /usr/bin/gedit Uxr,153 /usr/bin/gedit Uxr,
151 /usr/bin/gimp* Uxr,154 /usr/bin/gimp* Uxr,
152 /usr/bin/file-roller Uxr,155 /usr/bin/file-roller Uxr,
@@ -155,8 +158,16 @@
155 /usr/bin/oodraw Uxr,158 /usr/bin/oodraw Uxr,
156 /usr/bin/ooimpress Uxr,159 /usr/bin/ooimpress Uxr,
157 /usr/bin/oowriter Uxr,160 /usr/bin/oowriter Uxr,
161 /usr/lib/openoffice/program/soffice Uxr,
158 /usr/bin/gtk-gnash ixr,162 /usr/bin/gtk-gnash ixr,
159 /usr/bin/pulseaudio ixr,163 /usr/bin/pulseaudio ixr,
164 /usr/bin/nautilus Uxr,
165 /usr/bin/deluge Uxr,
166 /usr/bin/okular Uxr,
167 /usr/bin/transmission Uxr,
168
169 # Adobe Acrobat Reader
170 /opt/Adobe/Reader9/bin/acroread Uxr,
160171
161 # totem172 # totem
162 /usr/lib/totem/** ixr,173 /usr/lib/totem/** ixr,

Subscribers

People subscribed via source and target branches