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: Rejected
Rejected by: Micah Gersten
Proposed branch: lp:~mvo/firefox/fix-518747
Merge into: lp:firefox/3.6
Diff against target: 40 lines (+12/-0) (has conflicts)
2 files modified
debian/changelog (+6/-0)
debian/control (+6/-0)
Text conflict in debian/control
To merge this branch: bzr merge lp:~mvo/firefox/fix-518747
Reviewer Review Type Date Requested Status
Mozilla Team Pending
Review via email: mp+18928@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Merge conflicts exits

Unmerged revisions

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:12:33 +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:12:33 +0000
21@@ -66,6 +66,7 @@
22 Package: firefox-branding
23 Architecture: any
24 Depends: firefox (= ${binary:Version}), ${misc:Depends}
25+<<<<<<< TREE
26 Replaces: firefox,
27 firefox-3.6-branding,
28 firefox-3.5-branding,
29@@ -81,6 +82,11 @@
30 Provides: firefox-3.6-branding,
31 firefox-3.5-branding,
32 abrowser-branding
33+=======
34+Replaces: firefox, firefox-3.0, firefox-3.6-branding, firefox-3.5-branding, abrowser-branding, abrowser-3.5-branding, abrowser-3.6-branding
35+Conflicts: abrowser-branding, abrowser-3.5-branding, abrowser-3.6-branding, firefox-3.6-branding (<< 3.6~hg20100117r33523+nobinonly), firefox-3.5-branding (<< 3.6~hg20100117r33523)
36+Provides: firefox-3.6-branding, firefox-3.5-branding, abrowser-branding
37+>>>>>>> MERGE-SOURCE
38 Description: Package that ships the firefox branding
39 This package ships the Firefox branding bits. If you remove this package your
40 user experience will become that of the abrowser.

Subscribers

People subscribed via source and target branches