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

[Michael Vogt]

[Micah Gersten (micahg)]

Merge conflicts exits

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-29 14:35:18 +0000
+++ debian/changelog	2010-02-09 16:12:33 +0000
@@ -4,6 +4,12 @@
   * fix firefox-3.5-gnome-support transitional package typo; depend
     on firefox-gnome-support instead of firefox-3.5-gnome-support
     - update debian/control
+  
+  [ Michael Vogt ]
+  * debian/control:
+    - add missing Replace: firefox-3.0 for the firefox-branding
+      package (LP: #518747). This fixes a upgrade issues from
+      hardy to lucid.
 
   [ Jamie Strandboge <[e-mail]> ]
   * debian/firefox.postinst.in:

=== modified file 'debian/control'
--- debian/control	2010-01-28 16:07:33 +0000
+++ debian/control	2010-02-09 16:12:33 +0000
@@ -66,6 +66,7 @@
 Package: firefox-branding
 Architecture: any
 Depends: firefox (= ${binary:Version}), ${misc:Depends}
+<<<<<<< TREE
 Replaces: firefox, 
 	firefox-3.6-branding, 
 	firefox-3.5-branding, 
@@ -81,6 +82,11 @@
 Provides: firefox-3.6-branding, 
 	firefox-3.5-branding, 
 	abrowser-branding
+=======
+Replaces: firefox, firefox-3.0, firefox-3.6-branding, firefox-3.5-branding, abrowser-branding, abrowser-3.5-branding, abrowser-3.6-branding
+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)
+Provides: firefox-3.6-branding, firefox-3.5-branding, abrowser-branding
+>>>>>>> MERGE-SOURCE
 Description: Package that ships the firefox branding
  This package ships the Firefox branding bits. If you remove this package your
  user experience will become that of the abrowser.