Mozilla Firefox

Merge lp://staging/~micahg/firefox/firefox-3.6.head.daily-patch-rebase-20090910 into lp://staging/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://staging/~micahg/firefox/firefox-3.6.head.daily-patch-rebase-20090910
Merge into: lp://staging/firefox/3.6
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~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.staging.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
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-09-09 01:07:08 +0000
3+++ debian/changelog 2009-09-11 05:10:26 +0000
4@@ -1,3 +1,12 @@
5+firefox-3.6 (3.6~a2~hg20090910r31604+nobinonly-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * Rebase/minor code change after upstream landing of unified manifest (bmo: 511642)
8+ - update debian/patches/awesome_browser_branding_install.patch
9+ - update debian/patches/browser_branding.patch
10+ - update debian/patches/bzXXX_moz_app_name_inconsistencies.patch
11+
12+ -- Micah Gersten <launchpad@micahscomputing.com> Thu, 10 Sep 2009 23:39:01 -0500
13+
14 firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low
15
16 [ H. Montoliu <hmontoliu@ubuntu.com> ]
17
18=== modified file 'debian/patches/awesome_browser_branding_install.patch'
19--- debian/patches/awesome_browser_branding_install.patch 2008-08-28 12:48:16 +0000
20+++ debian/patches/awesome_browser_branding_install.patch 2009-09-11 05:10:26 +0000
21@@ -1,31 +1,30 @@
22 ---
23- browser/installer/unix/packages-static | 6 ++++++
24- 1 file changed, 6 insertions(+)
25+ browser/installer/package-manifest.in | 5 +++++
26+ 1 file changed, 5 insertions(+)
27
28-Index: mozilla/browser/installer/unix/packages-static
29+Index: mozilla/browser/installer/package-manifest.in
30 ===================================================================
31---- mozilla.orig/browser/installer/unix/packages-static
32-+++ mozilla/browser/installer/unix/packages-static
33-@@ -273,16 +273,22 @@
34- bin/chrome/toolkit.manifest
35- bin/chrome/icons/default/default16.png
36- bin/chrome/icons/default/default32.png
37- bin/chrome/icons/default/default48.png
38- bin/chrome/reporter.manifest
39- bin/chrome/reporter.jar
40- bin/@PREF_DIR@/reporter.js
41-
42-+bin/chrome/awesome-branding.jar
43-+bin/chrome/awesome-branding.manifest
44-+bin/chrome/awesome-branding-en-US.jar
45-+bin/chrome/awesome-branding-en-US.manifest
46-+
47-+
48- ; shell icons
49- bin/icons/*.xpm
50- bin/icons/*.png
51-
52- ; [Default Preferences]
53- ; All the pref files must be part of base to prevent migration bugs
54- bin/@PREF_DIR@/firefox.js
55- bin/@PREF_DIR@/firefox-branding.js
56+--- mozilla.orig/browser/installer/package-manifest.in
57++++ mozilla/browser/installer/package-manifest.in
58+@@ -368,16 +368,21 @@
59+ @BINPATH@/chrome/comm.jar
60+ @BINPATH@/chrome/comm.manifest
61+ @BINPATH@/chrome/reporter.jar
62+ @BINPATH@/chrome/reporter.manifest
63+ @BINPATH@/chrome/toolkit.jar
64+ @BINPATH@/chrome/toolkit.manifest
65+ @BINPATH@/@PREF_DIR@/reporter.js
66+ #ifdef XP_UNIX
67++; ubuntu awesome browser branding
68++@BINPATH@/chrome/awesome-branding.jar
69++@BINPATH@/chrome/awesome-branding.manifest
70++@BINPATH@/chrome/awesome-branding-en-US.jar
71++@BINPATH@/chrome/awesome-branding-en-US.manifest
72+ #ifndef XP_MACOSX
73+ @BINPATH@/chrome/icons/default/default16.png
74+ @BINPATH@/chrome/icons/default/default32.png
75+ @BINPATH@/chrome/icons/default/default48.png
76+ #endif
77+ #endif
78+
79+
80
81=== modified file 'debian/patches/browser_branding.patch'
82--- debian/patches/browser_branding.patch 2009-07-24 20:31:24 +0000
83+++ debian/patches/browser_branding.patch 2009-09-11 05:10:26 +0000
84@@ -3,10 +3,10 @@
85 browser/branding/nightly/locales/jar.mn | 2 +-
86 browser/branding/unofficial/content/jar.mn | 2 +-
87 browser/branding/unofficial/locales/jar.mn | 2 +-
88- browser/installer/unix/packages-static | 5 +++++
89+ browser/installer/package-manifest.in | 6 ++++++
90 other-licenses/branding/firefox/content/jar.mn | 2 +-
91 other-licenses/branding/firefox/locales/jar.mn | 2 +-
92- 7 files changed, 11 insertions(+), 6 deletions(-)
93+ 7 files changed, 12 insertions(+), 6 deletions(-)
94
95 Index: mozilla/browser/branding/unofficial/content/jar.mn
96 ===================================================================
97@@ -25,40 +25,42 @@
98 ===================================================================
99 --- mozilla.orig/browser/branding/unofficial/locales/jar.mn
100 +++ mozilla/browser/branding/unofficial/locales/jar.mn
101-@@ -1,6 +1,6 @@
102+@@ -1,7 +1,7 @@
103 #filter substitution
104
105 -@AB_CD@.jar:
106 +browser-branding-@AB_CD@.jar:
107 % locale branding @AB_CD@ %locale/branding/
108- locale/branding/brand.dtd (%brand.dtd)
109- * locale/branding/brand.properties (%brand.properties)
110-Index: mozilla/browser/installer/unix/packages-static
111+ # Unofficial branding only exists in en-US
112+ locale/branding/brand.dtd (en-US/brand.dtd)
113+ * locale/branding/brand.properties (en-US/brand.properties)
114+Index: mozilla/browser/installer/package-manifest.in
115 ===================================================================
116---- mozilla.orig/browser/installer/unix/packages-static
117-+++ mozilla/browser/installer/unix/packages-static
118-@@ -273,16 +273,21 @@
119- bin/chrome/toolkit.manifest
120- bin/chrome/icons/default/default16.png
121- bin/chrome/icons/default/default32.png
122- bin/chrome/icons/default/default48.png
123- bin/chrome/reporter.manifest
124- bin/chrome/reporter.jar
125- bin/@PREF_DIR@/reporter.js
126-
127-+bin/chrome/browser-branding.jar
128-+bin/chrome/browser-branding.manifest
129-+bin/chrome/browser-branding-en-US.jar
130-+bin/chrome/browser-branding-en-US.manifest
131-+
132- bin/chrome/awesome-branding.jar
133- bin/chrome/awesome-branding.manifest
134- bin/chrome/awesome-branding-en-US.jar
135- bin/chrome/awesome-branding-en-US.manifest
136-
137-
138- ; shell icons
139- bin/icons/*.xpm
140+--- mozilla.orig/browser/installer/package-manifest.in
141++++ mozilla/browser/installer/package-manifest.in
142+@@ -368,16 +368,22 @@
143+ @BINPATH@/chrome/comm.jar
144+ @BINPATH@/chrome/comm.manifest
145+ @BINPATH@/chrome/reporter.jar
146+ @BINPATH@/chrome/reporter.manifest
147+ @BINPATH@/chrome/toolkit.jar
148+ @BINPATH@/chrome/toolkit.manifest
149+ @BINPATH@/@PREF_DIR@/reporter.js
150+ #ifdef XP_UNIX
151++; ubuntu official branding
152++@BINPATH@/chrome/browser-branding.jar
153++@BINPATH@/chrome/browser-branding.manifest
154++@BINPATH@/chrome/browser-branding-en-US.jar
155++@BINPATH@/chrome/browser-branding-en-US.manifest
156++
157+ ; ubuntu awesome browser branding
158+ @BINPATH@/chrome/awesome-branding.jar
159+ @BINPATH@/chrome/awesome-branding.manifest
160+ @BINPATH@/chrome/awesome-branding-en-US.jar
161+ @BINPATH@/chrome/awesome-branding-en-US.manifest
162+ #ifndef XP_MACOSX
163+ @BINPATH@/chrome/icons/default/default16.png
164+ @BINPATH@/chrome/icons/default/default32.png
165 Index: mozilla/other-licenses/branding/firefox/content/jar.mn
166 ===================================================================
167 --- mozilla.orig/other-licenses/branding/firefox/content/jar.mn
168@@ -101,11 +103,12 @@
169 ===================================================================
170 --- mozilla.orig/browser/branding/nightly/locales/jar.mn
171 +++ mozilla/browser/branding/nightly/locales/jar.mn
172-@@ -1,6 +1,6 @@
173+@@ -1,7 +1,7 @@
174 #filter substitution
175
176 -@AB_CD@.jar:
177 +browser-branding-@AB_CD@.jar:
178 % locale branding @AB_CD@ %locale/branding/
179- locale/branding/brand.dtd (%brand.dtd)
180- * locale/branding/brand.properties (%brand.properties)
181+ # Nightly branding only exists in en-US
182+ locale/branding/brand.dtd (en-US/brand.dtd)
183+ * locale/branding/brand.properties (en-US/brand.properties)
184
185=== modified file 'debian/patches/bzXXX_moz_app_name_inconsistencies.patch'
186--- debian/patches/bzXXX_moz_app_name_inconsistencies.patch 2009-08-10 18:41:18 +0000
187+++ debian/patches/bzXXX_moz_app_name_inconsistencies.patch 2009-09-11 05:10:26 +0000
188@@ -1,27 +1,27 @@
189 ---
190- browser/installer/unix/packages-static | 2 +-
191+ browser/installer/package-manifest.in | 2 +-
192 1 file changed, 1 insertion(+), 1 deletion(-)
193
194-Index: mozilla/browser/installer/unix/packages-static
195+Index: mozilla/browser/installer/package-manifest.in
196 ===================================================================
197---- mozilla.orig/browser/installer/unix/packages-static
198-+++ mozilla/browser/installer/unix/packages-static
199-@@ -41,17 +41,17 @@
200- bin/libxpcom_core.so
201- bin/components/libxpinstall.so
202- bin/components/libjar50.so
203- #endif
204+--- mozilla.orig/browser/installer/package-manifest.in
205++++ mozilla/browser/installer/package-manifest.in
206+@@ -69,17 +69,17 @@
207
208 [browser]
209 ; [Base Browser Files]
210- bin/@MOZ_APP_NAME@-bin
211--bin/@MOZ_APP_NAME@
212-+bin/firefox
213- bin/application.ini
214- bin/platform.ini
215- bin/mozilla-xremote-client
216- bin/run-mozilla.sh
217- bin/plugins/libnullplugin.so
218- bin/libsqlite3.so
219- bin/README.txt
220- bin/blocklist.xml
221+ #ifdef XP_WIN32
222+ @BINPATH@/@MOZ_APP_NAME@.exe
223+ #else
224+ @BINPATH@/@MOZ_APP_NAME@-bin
225+ #ifndef XP_MACOSX
226+-@BINPATH@/@MOZ_APP_NAME@
227++@BINPATH@/firefox
228+ #endif
229+ #endif
230+ @BINPATH@/application.ini
231+ @BINPATH@/platform.ini
232+ #ifdef XP_MACOSX
233+ @BINPATH@/plugins/DefaultPlugin.plugin/
234+ #elifdef XP_UNIX
235+ @BINPATH@/plugins/libnullplugin.so

Subscribers

People subscribed via source and target branches