Mozilla Firefox

Merge lp://qastaging/~micahg/firefox/firefox-3.7-20091027 into lp://qastaging/~mozillateam/firefox/firefox-4.0.head.branch_format7

  1. firefox-3.7-20091027
  2. Merge into firefox-4.0.head.branch_fo...
Proposed by Micah Gersten
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~micahg/firefox/firefox-3.7-20091027
Merge into: lp://qastaging/~mozillateam/firefox/firefox-4.0.head.branch_format7
Diff against target: 52 lines
3 files modified
debian/changelog (+6/-2)
debian/control (+1/-0)
debian/patches/bzXXX_moz_app_name_inconsistencies.patch (+2/-2)
To merge this branch: bzr merge lp://qastaging/~micahg/firefox/firefox-3.7-20091027
Reviewer Review Type Date Requested Status
Mozilla Team Pending
Review via email: mp+14075@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Built fine in my ppa:
https://edge.launchpad.net/~micahg/+archive/mozilla-test/+build/1311797

lp://qastaging/~micahg/firefox/firefox-3.7-20091027 updated
474. By Micah Gersten

* Simple rebase
  - debian/patches/bzXXX_moz_app_name_inconsistencies.patch

475. By Micah Gersten

* Add mesa-common-dev to build-depends after landing of configure test aka (bmo: 517566) which is for WebGL aka (bmo: 516213)
  - update debian/control

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-22 21:30:32 +0000
+++ debian/changelog 2009-10-28 17:31:11 +0000
@@ -1,4 +1,4 @@
1firefox-3.7 (3.7~a1~hg20091022r34092+nobinonly-0ubuntu1) UNRELEASED; urgency=low1firefox-3.7 (3.7~a1~hg20091027r34228+nobinonly-0ubuntu1) UNRELEASED; urgency=low
22
3 [ Fabien Tassin ]3 [ Fabien Tassin ]
4 * Mass update from 3.6 to 3.74 * Mass update from 3.6 to 3.7
@@ -9,7 +9,11 @@
9 - add debian/moz-rev.sh9 - add debian/moz-rev.sh
10 - update debian/mozclient/firefox-3.7.conf10 - update debian/mozclient/firefox-3.7.conf
1111
12 -- Alexander Sack <asac@ubuntu.com> Thu, 22 Oct 2009 23:29:52 +020012 [ Micah Gersten ]
13 * Add mesa-common-dev to build-depends after landing of configure test aka (bmo: 517566) which is for WebGL aka (bmo: 516213)
14 - update debian/control
15
16 -- Micah Gersten <launchpad@micahscomputing.com> Wed, 28 Oct 2009 12:26:58 -0500
1317
14firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low18firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low
1519
1620
=== modified file 'debian/control'
--- debian/control 2009-09-02 13:14:14 +0000
+++ debian/control 2009-10-28 17:31:11 +0000
@@ -25,6 +25,7 @@
25 mozilla-devscripts (>= 0.10~),25 mozilla-devscripts (>= 0.10~),
26 lsb-release,26 lsb-release,
27 libiw-dev,27 libiw-dev,
28 mesa-common-dev,
28 libnotify-dev (>= 0.4)29 libnotify-dev (>= 0.4)
29Standards-Version: 3.8.130Standards-Version: 3.8.1
3031
3132
=== modified file 'debian/patches/bzXXX_moz_app_name_inconsistencies.patch'
--- debian/patches/bzXXX_moz_app_name_inconsistencies.patch 2009-09-11 01:55:33 +0000
+++ debian/patches/bzXXX_moz_app_name_inconsistencies.patch 2009-10-28 17:31:11 +0000
@@ -6,11 +6,11 @@
6===================================================================6===================================================================
7--- mozilla.orig/browser/installer/package-manifest.in7--- mozilla.orig/browser/installer/package-manifest.in
8+++ mozilla/browser/installer/package-manifest.in8+++ mozilla/browser/installer/package-manifest.in
9@@ -70,17 +70,17 @@9@@ -66,17 +66,17 @@
10 10
11 [browser]11 [browser]
12 ; [Base Browser Files]12 ; [Base Browser Files]
13 #ifdef XP_WIN3213 #ifndef XP_UNIX
14 @BINPATH@/@MOZ_APP_NAME@.exe14 @BINPATH@/@MOZ_APP_NAME@.exe
15 #else15 #else
16 @BINPATH@/@MOZ_APP_NAME@-bin16 @BINPATH@/@MOZ_APP_NAME@-bin

Subscribers

People subscribed via source and target branches

to all changes: