Mozilla Firefox

Merge lp:~mvo/firefox/fix-518747 into lp:firefox/3.6

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

Updated merge proposal, I re-merged from turnk/ and fixed the conflicts.

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-01-29 14:35:18 +0000
3+++ debian/changelog 2010-02-09 16:50:23 +0000
4@@ -4,6 +4,12 @@
5 * fix firefox-3.5-gnome-support transitional package typo; depend
6 on firefox-gnome-support instead of firefox-3.5-gnome-support
7 - update debian/control
8+
9+ [ Michael Vogt ]
10+ * debian/control:
11+ - add missing Replace: firefox-3.0 for the firefox-branding
12+ package (LP: #518747). This fixes a upgrade issues from
13+ hardy to lucid.
14
15 [ Jamie Strandboge <jamie@ubuntu.com> ]
16 * debian/firefox.postinst.in:
17
18=== modified file 'debian/control'
19--- debian/control 2010-01-28 16:07:33 +0000
20+++ debian/control 2010-02-09 16:50:23 +0000
21@@ -67,6 +67,7 @@
22 Architecture: any
23 Depends: firefox (= ${binary:Version}), ${misc:Depends}
24 Replaces: firefox,
25+ firefox-3.0,
26 firefox-3.6-branding,
27 firefox-3.5-branding,
28 abrowser-branding,

Subscribers

People subscribed via source and target branches