Mozilla Firefox

Merge lp://qastaging/~jdstrand/firefox/firefox-452591+455792+447006 into lp://qastaging/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://qastaging/~jdstrand/firefox/firefox-452591+455792+447006
Merge into: lp://qastaging/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://qastaging/~jdstrand/firefox/firefox-452591+455792+447006
Reviewer Review Type Date Requested Status
Mozilla Team Pending
Review via email: mp+14109@code.qastaging.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
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-20 22:12:27 +0000
+++ debian/changelog 2009-10-28 20:40:22 +0000
@@ -1,5 +1,6 @@
1firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu7) UNRELEASED; urgency=low1firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu7) UNRELEASED; urgency=low
22
3 [ Alexander Sack <asac@ubuntu.com> ]
3 * use awesome-browser-branch-3.5 during tarball creation4 * use awesome-browser-branch-3.5 during tarball creation
4 - update debian/mozclient/firefox-3.5.conf5 - update debian/mozclient/firefox-3.5.conf
5 * drop branding patch for lp:396156 as new upstream tarballs6 * drop branding patch for lp:396156 as new upstream tarballs
@@ -7,7 +8,14 @@
7 - delete debian/patches/lp396156_prepatch_abrowser_branding.patch8 - delete debian/patches/lp396156_prepatch_abrowser_branding.patch
8 - update debian/patches/series9 - update debian/patches/series
910
10 -- Alexander Sack <asac@ubuntu.com> Tue, 20 Oct 2009 22:46:16 +020011 [ Jamie Strandboge <jamie@ubuntu.com> ]
12 * apparmor fixes:
13 - allow access to nautilus, to allow "Open containing folder" to work
14 (LP: #452591)
15 - allow access for deluge (LP: #455792)
16 - add kde abstration (LP: #447006)
17
18 -- Jamie Strandboge <jamie@ubuntu.com> Wed, 28 Oct 2009 14:39:14 -0500
1119
12firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu6) karmic; urgency=low20firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu6) karmic; urgency=low
1321
1422
=== 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-10-28 20:40:22 +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>
@@ -129,6 +130,7 @@
129 /bin/ps Uxr,130 /bin/ps Uxr,
130 /bin/uname Uxr,131 /bin/uname Uxr,
131 /usr/bin/m4 ixr,132 /usr/bin/m4 ixr,
133 /usr/bin/mkfifo Uxr,
132 /usr/lib/nspluginwrapper/i386/linux/npviewer Uxr,134 /usr/lib/nspluginwrapper/i386/linux/npviewer Uxr,
133 /var/lib/ r,135 /var/lib/ r,
134 /var/lib/** mr,136 /var/lib/** mr,
@@ -157,6 +159,8 @@
157 /usr/bin/oowriter Uxr,159 /usr/bin/oowriter Uxr,
158 /usr/bin/gtk-gnash ixr,160 /usr/bin/gtk-gnash ixr,
159 /usr/bin/pulseaudio ixr,161 /usr/bin/pulseaudio ixr,
162 /usr/bin/nautilus Uxr,
163 /usr/bin/deluge Uxr,
160164
161 # totem165 # totem
162 /usr/lib/totem/** ixr,166 /usr/lib/totem/** ixr,

Subscribers

People subscribed via source and target branches