Mozilla Firefox

Merge lp:~gnomefreak/firefox/firefox.dev into lp:firefox/3.5

  1. firefox.dev
  2. Merge into firefox-3.5.head
Proposed by John Vivirito
Status: Merged
Approved by: Alexander Sack
Approved revision: 440
Merged at revision: not available
Proposed branch: lp:~gnomefreak/firefox/firefox.dev
Merge into: lp:firefox/3.5
Diff against target: None lines
To merge this branch: bzr merge lp:~gnomefreak/firefox/firefox.dev
Reviewer Review Type Date Requested Status
Alexander Sack (community) Approve
Review via email: mp+9113@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Sack (asac) wrote :

looks good.

review: Approve
Revision history for this message
Micah Gersten (micahg) wrote :

This is unnecessary now that KDE is supported in apturl.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-07-19 17:41:33 +0000
+++ debian/changelog 2009-07-21 21:40:42 +0000
@@ -6,6 +6,9 @@
6 * Fix bogus prerm rule removing the wrong alternative6 * Fix bogus prerm rule removing the wrong alternative
7 - update renamed debian/firefox-3.5.prerm7 - update renamed debian/firefox-3.5.prerm
88
9 [ John Vivirito <gnomefreak@ubuntu.com> ]
10 * Fixes (LP: #365965): Moved ubufox to suggests from recommends
11
9 -- Fabien Tassin <fta@ubuntu.com> Sat, 18 Jul 2009 18:29:53 +020012 -- Fabien Tassin <fta@ubuntu.com> Sat, 18 Jul 2009 18:29:53 +0200
1013
11firefox-3.5 (3.5.1+build1+nobinonly-0ubuntu1) karmic; urgency=low14firefox-3.5 (3.5.1+build1+nobinonly-0ubuntu1) karmic; urgency=low
1215
=== modified file 'debian/control'
--- debian/control 2009-06-30 18:11:35 +0000
+++ debian/control 2009-07-21 21:40:42 +0000
@@ -34,8 +34,7 @@
34 xulrunner-1.9.1 (>= 1.9.1), 34 xulrunner-1.9.1 (>= 1.9.1),
35 ${shlibs:Depends}, ${misc:Depends},35 ${shlibs:Depends}, ${misc:Depends},
36 firefox-3.5-branding | abrowser-3.5-branding36 firefox-3.5-branding | abrowser-3.5-branding
37Recommends: ubufox37Suggests: firefox-3.5-gnome-support (= ${binary:Version}), latex-xft-fonts, libthai0, ubufox
38Suggests: firefox-3.5-gnome-support (= ${binary:Version}), latex-xft-fonts, libthai0
39Provides: www-browser, firefox-3.138Provides: www-browser, firefox-3.1
40Conflicts: firefox-3.1 (<< 3.1~b4~hg20090317)39Conflicts: firefox-3.1 (<< 3.1~b4~hg20090317)
41Replaces: firefox-3.140Replaces: firefox-3.1

Subscribers

People subscribed via source and target branches