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
4
  * fix firefox-3.5-gnome-support transitional package typo; depend
4
  * fix firefox-3.5-gnome-support transitional package typo; depend
6
5
    on firefox-gnome-support instead of firefox-3.5-gnome-support
5
    on firefox-gnome-support instead of firefox-3.5-gnome-support
7
6
    - update debian/control
6
    - update debian/control
8
7
  
9
8
  [ Michael Vogt ]
10
9
  * debian/control:
11
10
    - add missing Replace: firefox-3.0 for the firefox-branding
12
11
      package (LP: #518747). This fixes a upgrade issues from
13
12
      hardy to lucid.
14
7
13
15
8
  [ Jamie Strandboge <jamie@ubuntu.com> ]
14
  [ Jamie Strandboge <jamie@ubuntu.com> ]
16
9
  * debian/firefox.postinst.in:
15
  * debian/firefox.postinst.in:
17
10
16
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
66
Package: firefox-branding
66
Package: firefox-branding
23
67
Architecture: any
67
Architecture: any
24
68
Depends: firefox (= ${binary:Version}), ${misc:Depends}
68
Depends: firefox (= ${binary:Version}), ${misc:Depends}
25
69
<<<<<<< TREE
26
69
Replaces: firefox, 
70
Replaces: firefox, 
27
70
	firefox-3.6-branding, 
71
	firefox-3.6-branding, 
28
71
	firefox-3.5-branding, 
72
	firefox-3.5-branding, 
29
@@ -81,6 +82,11 @@
30
81
Provides: firefox-3.6-branding, 
82
Provides: firefox-3.6-branding, 
31
82
	firefox-3.5-branding, 
83
	firefox-3.5-branding, 
32
83
	abrowser-branding
84
	abrowser-branding
33
85
=======
34
86
Replaces: firefox, firefox-3.0, firefox-3.6-branding, firefox-3.5-branding, abrowser-branding, abrowser-3.5-branding, abrowser-3.6-branding
35
87
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
88
Provides: firefox-3.6-branding, firefox-3.5-branding, abrowser-branding
37
89
>>>>>>> MERGE-SOURCE
38
84
Description: Package that ships the firefox branding
90
Description: Package that ships the firefox branding
39
85
 This package ships the Firefox branding bits. If you remove this package your
91
 This package ships the Firefox branding bits. If you remove this package your
40
86
 user experience will become that of the abrowser.
92
 user experience will become that of the abrowser.
Reviewer	Review Type	Date Requested	Status
Mozilla Team		2010-02-09	Pending
Review via email: mp+18928@code.launchpad.net