Mozilla Firefox

Merge lp:~micahg/firefox/firefox-3.7-20091027 into lp:~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:~micahg/firefox/firefox-3.7-20091027
Merge into: lp:~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:~micahg/firefox/firefox-3.7-20091027
Reviewer Review Type Date Requested Status
Mozilla Team Pending
Review via email: mp+14075@code.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:~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
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-10-22 21:30:32 +0000
3+++ debian/changelog 2009-10-28 17:31:11 +0000
4@@ -1,4 +1,4 @@
5-firefox-3.7 (3.7~a1~hg20091022r34092+nobinonly-0ubuntu1) UNRELEASED; urgency=low
6+firefox-3.7 (3.7~a1~hg20091027r34228+nobinonly-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Fabien Tassin ]
9 * Mass update from 3.6 to 3.7
10@@ -9,7 +9,11 @@
11 - add debian/moz-rev.sh
12 - update debian/mozclient/firefox-3.7.conf
13
14- -- Alexander Sack <asac@ubuntu.com> Thu, 22 Oct 2009 23:29:52 +0200
15+ [ Micah Gersten ]
16+ * Add mesa-common-dev to build-depends after landing of configure test aka (bmo: 517566) which is for WebGL aka (bmo: 516213)
17+ - update debian/control
18+
19+ -- Micah Gersten <launchpad@micahscomputing.com> Wed, 28 Oct 2009 12:26:58 -0500
20
21 firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low
22
23
24=== modified file 'debian/control'
25--- debian/control 2009-09-02 13:14:14 +0000
26+++ debian/control 2009-10-28 17:31:11 +0000
27@@ -25,6 +25,7 @@
28 mozilla-devscripts (>= 0.10~),
29 lsb-release,
30 libiw-dev,
31+ mesa-common-dev,
32 libnotify-dev (>= 0.4)
33 Standards-Version: 3.8.1
34
35
36=== modified file 'debian/patches/bzXXX_moz_app_name_inconsistencies.patch'
37--- debian/patches/bzXXX_moz_app_name_inconsistencies.patch 2009-09-11 01:55:33 +0000
38+++ debian/patches/bzXXX_moz_app_name_inconsistencies.patch 2009-10-28 17:31:11 +0000
39@@ -6,11 +6,11 @@
40 ===================================================================
41 --- mozilla.orig/browser/installer/package-manifest.in
42 +++ mozilla/browser/installer/package-manifest.in
43-@@ -70,17 +70,17 @@
44+@@ -66,17 +66,17 @@
45
46 [browser]
47 ; [Base Browser Files]
48- #ifdef XP_WIN32
49+ #ifndef XP_UNIX
50 @BINPATH@/@MOZ_APP_NAME@.exe
51 #else
52 @BINPATH@/@MOZ_APP_NAME@-bin

Subscribers

People subscribed via source and target branches

to all changes: