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

Proposed by Michael Vogt
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~mvo/firefox/fix-518747
Merge into: lp://qastaging/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://qastaging/~mvo/firefox/fix-518747
Reviewer Review Type Date Requested Status
Mozilla Team Pending
Review via email: mp+18933@code.qastaging.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
=== modified file 'debian/changelog'
--- debian/changelog 2010-01-29 14:35:18 +0000
+++ debian/changelog 2010-02-09 16:50:23 +0000
@@ -4,6 +4,12 @@
4 * fix firefox-3.5-gnome-support transitional package typo; depend4 * fix firefox-3.5-gnome-support transitional package typo; depend
5 on firefox-gnome-support instead of firefox-3.5-gnome-support5 on firefox-gnome-support instead of firefox-3.5-gnome-support
6 - update debian/control6 - update debian/control
7
8 [ Michael Vogt ]
9 * debian/control:
10 - add missing Replace: firefox-3.0 for the firefox-branding
11 package (LP: #518747). This fixes a upgrade issues from
12 hardy to lucid.
713
8 [ Jamie Strandboge <jamie@ubuntu.com> ]14 [ Jamie Strandboge <jamie@ubuntu.com> ]
9 * debian/firefox.postinst.in:15 * debian/firefox.postinst.in:
1016
=== modified file 'debian/control'
--- debian/control 2010-01-28 16:07:33 +0000
+++ debian/control 2010-02-09 16:50:23 +0000
@@ -67,6 +67,7 @@
67Architecture: any67Architecture: any
68Depends: firefox (= ${binary:Version}), ${misc:Depends}68Depends: firefox (= ${binary:Version}), ${misc:Depends}
69Replaces: firefox, 69Replaces: firefox,
70 firefox-3.0,
70 firefox-3.6-branding, 71 firefox-3.6-branding,
71 firefox-3.5-branding, 72 firefox-3.5-branding,
72 abrowser-branding, 73 abrowser-branding,

Subscribers

People subscribed via source and target branches