Mozilla Firefox

Merge lp:~micahg/firefox/firefox-3.6.head.daily-patch-rebase-20090910 into lp:firefox/3.6

  1. firefox-3.6.head.daily-patch-rebase-20090910
  2. Merge into firefox-3.6.head
Proposed by Alexander Sack
Status: Merged
Approved by: Alexander Sack
Approved revision: 451
Merge reported by: Alexander Sack
Merged at revision: not available
Proposed branch: lp:~micahg/firefox/firefox-3.6.head.daily-patch-rebase-20090910
Merge into: lp:firefox/3.6
Diff against target: None lines
To merge this branch: bzr merge lp:~micahg/firefox/firefox-3.6.head.daily-patch-rebase-20090910
Reviewer Review Type Date Requested Status
Alexander Sack (community) Approve
Review via email: mp+11602@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Sack (asac) wrote :

please dont add new changelog entries if the topmost is UNRELEASED.
Also dont include debian/changelog updates in bzr commit.

Besides from that it looks good. will merge and adjust the things from above.

review: Approve
Revision history for this message
Alexander Sack (asac) wrote :

> please dont add new changelog entries if the topmost is UNRELEASED.
> Also dont include debian/changelog updates in bzr commit.
>
> Besides from that it looks good. will merge and adjust the things from above.

also do a "New upstream snapshot ..." commit first where you bump the changelog version.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-09-09 01:07:08 +0000
+++ debian/changelog 2009-09-11 05:10:26 +0000
@@ -1,3 +1,12 @@
1firefox-3.6 (3.6~a2~hg20090910r31604+nobinonly-0ubuntu1) UNRELEASED; urgency=low
2
3 * Rebase/minor code change after upstream landing of unified manifest (bmo: 511642)
4 - update debian/patches/awesome_browser_branding_install.patch
5 - update debian/patches/browser_branding.patch
6 - update debian/patches/bzXXX_moz_app_name_inconsistencies.patch
7
8 -- Micah Gersten <launchpad@micahscomputing.com> Thu, 10 Sep 2009 23:39:01 -0500
9
1firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low10firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low
211
3 [ H. Montoliu <hmontoliu@ubuntu.com> ]12 [ H. Montoliu <hmontoliu@ubuntu.com> ]
413
=== modified file 'debian/patches/awesome_browser_branding_install.patch'
--- debian/patches/awesome_browser_branding_install.patch 2008-08-28 12:48:16 +0000
+++ debian/patches/awesome_browser_branding_install.patch 2009-09-11 05:10:26 +0000
@@ -1,31 +1,30 @@
1---1---
2 browser/installer/unix/packages-static | 6 ++++++2 browser/installer/package-manifest.in | 5 +++++
3 1 file changed, 6 insertions(+)3 1 file changed, 5 insertions(+)
44
5Index: mozilla/browser/installer/unix/packages-static5Index: mozilla/browser/installer/package-manifest.in
6===================================================================6===================================================================
7--- mozilla.orig/browser/installer/unix/packages-static7--- mozilla.orig/browser/installer/package-manifest.in
8+++ mozilla/browser/installer/unix/packages-static8+++ mozilla/browser/installer/package-manifest.in
9@@ -273,16 +273,22 @@9@@ -368,16 +368,21 @@
10 bin/chrome/toolkit.manifest10 @BINPATH@/chrome/comm.jar
11 bin/chrome/icons/default/default16.png11 @BINPATH@/chrome/comm.manifest
12 bin/chrome/icons/default/default32.png12 @BINPATH@/chrome/reporter.jar
13 bin/chrome/icons/default/default48.png13 @BINPATH@/chrome/reporter.manifest
14 bin/chrome/reporter.manifest14 @BINPATH@/chrome/toolkit.jar
15 bin/chrome/reporter.jar15 @BINPATH@/chrome/toolkit.manifest
16 bin/@PREF_DIR@/reporter.js16 @BINPATH@/@PREF_DIR@/reporter.js
17 17 #ifdef XP_UNIX
18+bin/chrome/awesome-branding.jar18+; ubuntu awesome browser branding
19+bin/chrome/awesome-branding.manifest19+@BINPATH@/chrome/awesome-branding.jar
20+bin/chrome/awesome-branding-en-US.jar20+@BINPATH@/chrome/awesome-branding.manifest
21+bin/chrome/awesome-branding-en-US.manifest21+@BINPATH@/chrome/awesome-branding-en-US.jar
22+22+@BINPATH@/chrome/awesome-branding-en-US.manifest
23+23 #ifndef XP_MACOSX
24 ; shell icons24 @BINPATH@/chrome/icons/default/default16.png
25 bin/icons/*.xpm25 @BINPATH@/chrome/icons/default/default32.png
26 bin/icons/*.png26 @BINPATH@/chrome/icons/default/default48.png
27 27 #endif
28 ; [Default Preferences]28 #endif
29 ; All the pref files must be part of base to prevent migration bugs29
30 bin/@PREF_DIR@/firefox.js30
31 bin/@PREF_DIR@/firefox-branding.js
3231
=== modified file 'debian/patches/browser_branding.patch'
--- debian/patches/browser_branding.patch 2009-07-24 20:31:24 +0000
+++ debian/patches/browser_branding.patch 2009-09-11 05:10:26 +0000
@@ -3,10 +3,10 @@
3 browser/branding/nightly/locales/jar.mn | 2 +-3 browser/branding/nightly/locales/jar.mn | 2 +-
4 browser/branding/unofficial/content/jar.mn | 2 +-4 browser/branding/unofficial/content/jar.mn | 2 +-
5 browser/branding/unofficial/locales/jar.mn | 2 +-5 browser/branding/unofficial/locales/jar.mn | 2 +-
6 browser/installer/unix/packages-static | 5 +++++6 browser/installer/package-manifest.in | 6 ++++++
7 other-licenses/branding/firefox/content/jar.mn | 2 +-7 other-licenses/branding/firefox/content/jar.mn | 2 +-
8 other-licenses/branding/firefox/locales/jar.mn | 2 +-8 other-licenses/branding/firefox/locales/jar.mn | 2 +-
9 7 files changed, 11 insertions(+), 6 deletions(-)9 7 files changed, 12 insertions(+), 6 deletions(-)
1010
11Index: mozilla/browser/branding/unofficial/content/jar.mn11Index: mozilla/browser/branding/unofficial/content/jar.mn
12===================================================================12===================================================================
@@ -25,40 +25,42 @@
25===================================================================25===================================================================
26--- mozilla.orig/browser/branding/unofficial/locales/jar.mn26--- mozilla.orig/browser/branding/unofficial/locales/jar.mn
27+++ mozilla/browser/branding/unofficial/locales/jar.mn27+++ mozilla/browser/branding/unofficial/locales/jar.mn
28@@ -1,6 +1,6 @@28@@ -1,7 +1,7 @@
29 #filter substitution29 #filter substitution
30 30
31-@AB_CD@.jar:31-@AB_CD@.jar:
32+browser-branding-@AB_CD@.jar:32+browser-branding-@AB_CD@.jar:
33 % locale branding @AB_CD@ %locale/branding/33 % locale branding @AB_CD@ %locale/branding/
34 locale/branding/brand.dtd (%brand.dtd)34 # Unofficial branding only exists in en-US
35 * locale/branding/brand.properties (%brand.properties)35 locale/branding/brand.dtd (en-US/brand.dtd)
36Index: mozilla/browser/installer/unix/packages-static36 * locale/branding/brand.properties (en-US/brand.properties)
37Index: mozilla/browser/installer/package-manifest.in
37===================================================================38===================================================================
38--- mozilla.orig/browser/installer/unix/packages-static39--- mozilla.orig/browser/installer/package-manifest.in
39+++ mozilla/browser/installer/unix/packages-static40+++ mozilla/browser/installer/package-manifest.in
40@@ -273,16 +273,21 @@41@@ -368,16 +368,22 @@
41 bin/chrome/toolkit.manifest42 @BINPATH@/chrome/comm.jar
42 bin/chrome/icons/default/default16.png43 @BINPATH@/chrome/comm.manifest
43 bin/chrome/icons/default/default32.png44 @BINPATH@/chrome/reporter.jar
44 bin/chrome/icons/default/default48.png45 @BINPATH@/chrome/reporter.manifest
45 bin/chrome/reporter.manifest46 @BINPATH@/chrome/toolkit.jar
46 bin/chrome/reporter.jar47 @BINPATH@/chrome/toolkit.manifest
47 bin/@PREF_DIR@/reporter.js48 @BINPATH@/@PREF_DIR@/reporter.js
48 49 #ifdef XP_UNIX
49+bin/chrome/browser-branding.jar50+; ubuntu official branding
50+bin/chrome/browser-branding.manifest51+@BINPATH@/chrome/browser-branding.jar
51+bin/chrome/browser-branding-en-US.jar52+@BINPATH@/chrome/browser-branding.manifest
52+bin/chrome/browser-branding-en-US.manifest53+@BINPATH@/chrome/browser-branding-en-US.jar
53+54+@BINPATH@/chrome/browser-branding-en-US.manifest
54 bin/chrome/awesome-branding.jar55+
55 bin/chrome/awesome-branding.manifest56 ; ubuntu awesome browser branding
56 bin/chrome/awesome-branding-en-US.jar57 @BINPATH@/chrome/awesome-branding.jar
57 bin/chrome/awesome-branding-en-US.manifest58 @BINPATH@/chrome/awesome-branding.manifest
58 59 @BINPATH@/chrome/awesome-branding-en-US.jar
59 60 @BINPATH@/chrome/awesome-branding-en-US.manifest
60 ; shell icons61 #ifndef XP_MACOSX
61 bin/icons/*.xpm62 @BINPATH@/chrome/icons/default/default16.png
63 @BINPATH@/chrome/icons/default/default32.png
62Index: mozilla/other-licenses/branding/firefox/content/jar.mn64Index: mozilla/other-licenses/branding/firefox/content/jar.mn
63===================================================================65===================================================================
64--- mozilla.orig/other-licenses/branding/firefox/content/jar.mn66--- mozilla.orig/other-licenses/branding/firefox/content/jar.mn
@@ -101,11 +103,12 @@
101===================================================================103===================================================================
102--- mozilla.orig/browser/branding/nightly/locales/jar.mn104--- mozilla.orig/browser/branding/nightly/locales/jar.mn
103+++ mozilla/browser/branding/nightly/locales/jar.mn105+++ mozilla/browser/branding/nightly/locales/jar.mn
104@@ -1,6 +1,6 @@106@@ -1,7 +1,7 @@
105 #filter substitution107 #filter substitution
106 108
107-@AB_CD@.jar:109-@AB_CD@.jar:
108+browser-branding-@AB_CD@.jar:110+browser-branding-@AB_CD@.jar:
109 % locale branding @AB_CD@ %locale/branding/111 % locale branding @AB_CD@ %locale/branding/
110 locale/branding/brand.dtd (%brand.dtd)112 # Nightly branding only exists in en-US
111 * locale/branding/brand.properties (%brand.properties)113 locale/branding/brand.dtd (en-US/brand.dtd)
114 * locale/branding/brand.properties (en-US/brand.properties)
112115
=== modified file 'debian/patches/bzXXX_moz_app_name_inconsistencies.patch'
--- debian/patches/bzXXX_moz_app_name_inconsistencies.patch 2009-08-10 18:41:18 +0000
+++ debian/patches/bzXXX_moz_app_name_inconsistencies.patch 2009-09-11 05:10:26 +0000
@@ -1,27 +1,27 @@
1---1---
2 browser/installer/unix/packages-static | 2 +-2 browser/installer/package-manifest.in | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)3 1 file changed, 1 insertion(+), 1 deletion(-)
44
5Index: mozilla/browser/installer/unix/packages-static5Index: mozilla/browser/installer/package-manifest.in
6===================================================================6===================================================================
7--- mozilla.orig/browser/installer/unix/packages-static7--- mozilla.orig/browser/installer/package-manifest.in
8+++ mozilla/browser/installer/unix/packages-static8+++ mozilla/browser/installer/package-manifest.in
9@@ -41,17 +41,17 @@9@@ -69,17 +69,17 @@
10 bin/libxpcom_core.so
11 bin/components/libxpinstall.so
12 bin/components/libjar50.so
13 #endif
14 10
15 [browser]11 [browser]
16 ; [Base Browser Files]12 ; [Base Browser Files]
17 bin/@MOZ_APP_NAME@-bin13 #ifdef XP_WIN32
18-bin/@MOZ_APP_NAME@14 @BINPATH@/@MOZ_APP_NAME@.exe
19+bin/firefox15 #else
20 bin/application.ini16 @BINPATH@/@MOZ_APP_NAME@-bin
21 bin/platform.ini17 #ifndef XP_MACOSX
22 bin/mozilla-xremote-client18-@BINPATH@/@MOZ_APP_NAME@
23 bin/run-mozilla.sh19+@BINPATH@/firefox
24 bin/plugins/libnullplugin.so20 #endif
25 bin/libsqlite3.so21 #endif
26 bin/README.txt22 @BINPATH@/application.ini
27 bin/blocklist.xml23 @BINPATH@/platform.ini
24 #ifdef XP_MACOSX
25 @BINPATH@/plugins/DefaultPlugin.plugin/
26 #elifdef XP_UNIX
27 @BINPATH@/plugins/libnullplugin.so

Subscribers

People subscribed via source and target branches