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

Proposed by John Vivirito
Status: Rejected
Rejected by: John Vivirito
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
Mozilla Team Pending
Review via email: mp+9108@code.launchpad.net
To post a comment you must log in.
Revision history for this message
John Vivirito (gnomefreak) wrote :

ok changed karmic to UNRELEASED

lp:~gnomefreak/firefox/firefox.dev updated
440. By John Vivirito

  * Fixes (LP: #365965): Moved ubufox to suggests from recommends

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 2009-07-19 17:41:33 +0000
3+++ debian/changelog 2009-07-21 20:29:36 +0000
4@@ -1,3 +1,9 @@
5+firefox-3.5 (3.5.1+build1+nobinonly-0ubuntu3) UNRELEASED; urgency=low
6+
7+ * Fixes (LP: #365965): Moved ubufox to suggests from recommends
8+
9+ -- John Vivirito <gnomefreak@ubuntu.com> Tue, 21 Jul 2009 16:29:01 -0400
10+
11 firefox-3.5 (3.5.1+build1+nobinonly-0ubuntu2) UNRELEASED; urgency=low
12
13 * Fix postinst to also consider firefox-3.5 for the update-notifier
14
15=== modified file 'debian/control'
16--- debian/control 2009-06-30 18:11:35 +0000
17+++ debian/control 2009-07-21 20:29:36 +0000
18@@ -34,8 +34,7 @@
19 xulrunner-1.9.1 (>= 1.9.1),
20 ${shlibs:Depends}, ${misc:Depends},
21 firefox-3.5-branding | abrowser-3.5-branding
22-Recommends: ubufox
23-Suggests: firefox-3.5-gnome-support (= ${binary:Version}), latex-xft-fonts, libthai0
24+Suggests: firefox-3.5-gnome-support (= ${binary:Version}), latex-xft-fonts, libthai0, ubufox
25 Provides: www-browser, firefox-3.1
26 Conflicts: firefox-3.1 (<< 3.1~b4~hg20090317)
27 Replaces: firefox-3.1

Subscribers

People subscribed via source and target branches