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

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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-19 18:31:31 +0000
3+++ debian/changelog 2010-02-20 11:49:15 +0000
4@@ -1,9 +1,14 @@
5 firefox (3.6+nobinonly-0ubuntu5) UNRELEASED; urgency=low
6
7+ [ Micah Gersten <micahg@ubuntu.com> ]
8 * fix LP: #514108 - Cookie Accept Dialog Not Shown on Firefox 3.6; install chrome/comm.* libraries
9 - update debian/rules
10
11- -- Micah Gersten <micahg@ubuntu.com> Fri, 19 Feb 2010 12:24:52 -0600
12+ [ Felix Geyer <debfx-pkg@fobos.de> ]
13+ * fix LP: #396786 - Default theme missing in Firefox 3.6
14+ - update debian/firefox.install
15+
16+ -- Felix Geyer <debfx-pkg@fobos.de> Sat, 20 Feb 2010 12:12:41 +0100
17
18 firefox (3.6+nobinonly-0ubuntu4) lucid; urgency=low
19
20
21=== modified file 'debian/firefox.install'
22--- debian/firefox.install 2010-02-17 05:11:25 +0000
23+++ debian/firefox.install 2010-02-20 11:49:15 +0000
24@@ -16,7 +16,7 @@
25 #debian/debsearch.gif usr/lib/firefox-addons/searchplugins
26 #debian/debsearch.src usr/lib/firefox-addons/searchplugins
27
28-## debian/tmp/usr/lib/firefox-*/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/lib/xulrunner-addons/extensions
29+debian/tmp/usr/lib/firefox-*/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/lib/firefox-addons/extensions
30
31 # debian/tmp/usr/lib/firefox-*/plugins/*.so usr/lib/firefox-addons/plugins
32

Subscribers

People subscribed via source and target branches