Mozilla Firefox

Merge lp://qastaging/~debfx/firefox/fix-lp-396786 into lp://qastaging/firefox/3.6

  1. fix-lp-396786
  2. Merge into firefox-3.6.head
Proposed by Felix Geyer
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~debfx/firefox/fix-lp-396786
Merge into: lp://qastaging/firefox/3.6
Diff against target: 31 lines (+7/-2)
2 files modified
debian/changelog (+6/-1)
debian/firefox.install (+1/-1)
To merge this branch: bzr merge lp://qastaging/~debfx/firefox/fix-lp-396786
Reviewer Review Type Date Requested Status
Mozilla Team Pending
Review via email: mp+19771@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Felix Geyer (debfx) wrote :

* fix LP: #396786 - Default theme missing in Firefox 3.6
  - update debian/firefox.install

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-02-19 18:31:31 +0000
+++ debian/changelog 2010-02-20 11:49:15 +0000
@@ -1,9 +1,14 @@
1firefox (3.6+nobinonly-0ubuntu5) UNRELEASED; urgency=low1firefox (3.6+nobinonly-0ubuntu5) UNRELEASED; urgency=low
22
3 [ Micah Gersten <micahg@ubuntu.com> ]
3 * fix LP: #514108 - Cookie Accept Dialog Not Shown on Firefox 3.6; install chrome/comm.* libraries4 * fix LP: #514108 - Cookie Accept Dialog Not Shown on Firefox 3.6; install chrome/comm.* libraries
4 - update debian/rules5 - update debian/rules
56
6 -- Micah Gersten <micahg@ubuntu.com> Fri, 19 Feb 2010 12:24:52 -06007 [ Felix Geyer <debfx-pkg@fobos.de> ]
8 * fix LP: #396786 - Default theme missing in Firefox 3.6
9 - update debian/firefox.install
10
11 -- Felix Geyer <debfx-pkg@fobos.de> Sat, 20 Feb 2010 12:12:41 +0100
712
8firefox (3.6+nobinonly-0ubuntu4) lucid; urgency=low13firefox (3.6+nobinonly-0ubuntu4) lucid; urgency=low
914
1015
=== modified file 'debian/firefox.install'
--- debian/firefox.install 2010-02-17 05:11:25 +0000
+++ debian/firefox.install 2010-02-20 11:49:15 +0000
@@ -16,7 +16,7 @@
16#debian/debsearch.gif usr/lib/firefox-addons/searchplugins16#debian/debsearch.gif usr/lib/firefox-addons/searchplugins
17#debian/debsearch.src usr/lib/firefox-addons/searchplugins17#debian/debsearch.src usr/lib/firefox-addons/searchplugins
1818
19## debian/tmp/usr/lib/firefox-*/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/lib/xulrunner-addons/extensions19debian/tmp/usr/lib/firefox-*/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/lib/firefox-addons/extensions
2020
21# debian/tmp/usr/lib/firefox-*/plugins/*.so usr/lib/firefox-addons/plugins21# debian/tmp/usr/lib/firefox-*/plugins/*.so usr/lib/firefox-addons/plugins
2222

Subscribers

People subscribed via source and target branches