← Back to branch summary

~udienz/firefox/firefox.blankon

« back to all changes in this revision

Viewing changes to debian/patches/browser_branding.patch

  • Committer: Mahyuddin Susanto
  • Author(s): Chris Coulson
  • Date: 2010-11-22 12:52:28 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: udienz@blankonlinux.or.id-20101122125228-n43yn5grb17xl0bp
Tags: 4.0~b7+nobinonly-0ubuntu3
* Build with --enable-startup-notification again, this got dropped
  in the 3.6 => 4.0 update
  - update debian/mozconfig.in
* Ship the testpilot extension for beta as per the official builds, based
  on the discussion on #developers. We achieve this by building with
  --enable-update-channel=beta for the beta milestones only. The update
  channel isn't used anywhere at runtime because we disable the updater.
  This means that Ubuntu users can participate in testpilot user studies
  in Natty
  - update debian/rules
  - update debian/firefox.install.in
  - update debian/mozconfig.in

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/browser_branding.patch
3
3
 browser/branding/nightly/locales/jar.mn        |    2 +-
4
4
 browser/branding/unofficial/content/jar.mn     |    2 +-
5
5
 browser/branding/unofficial/locales/jar.mn     |    2 +-
6
 
 browser/installer/package-manifest.in          |    6 ++++++
 
6
 browser/installer/package-manifest.in          |    5 +++++
7
7
 other-licenses/branding/firefox/content/jar.mn |    2 +-
8
8
 other-licenses/branding/firefox/locales/jar.mn |    2 +-
9
 
 7 files changed, 12 insertions(+), 6 deletions(-)
 
9
 7 files changed, 11 insertions(+), 6 deletions(-)
10
10
 
11
 
Index: mozilla/browser/branding/unofficial/content/jar.mn
12
 
===================================================================
13
 
--- mozilla.orig/browser/branding/unofficial/content/jar.mn
14
 
+++ mozilla/browser/branding/unofficial/content/jar.mn
15
 
@@ -1,7 +1,7 @@
16
 
-browser.jar:
17
 
+browser-branding.jar:
18
 
 % content branding %content/branding/ xpcnativewrappers=yes
19
 
   content/branding/about.png                     (about.png)
20
 
   content/branding/aboutCredits.png              (aboutCredits.png)
21
 
   content/branding/aboutFooter.png               (aboutFooter.png)
22
 
   content/branding/icon48.png                    (icon48.png)
23
 
   content/branding/icon64.png                    (icon64.png)
24
 
Index: mozilla/browser/branding/unofficial/locales/jar.mn
25
 
===================================================================
26
 
--- mozilla.orig/browser/branding/unofficial/locales/jar.mn
27
 
+++ mozilla/browser/branding/unofficial/locales/jar.mn
28
 
@@ -1,7 +1,7 @@
 
11
--- a/browser/branding/unofficial/locales/jar.mn
 
12
+++ b/browser/branding/unofficial/locales/jar.mn
 
13
@@ -1,6 +1,6 @@
29
14
 #filter substitution
30
15
 
31
16
-@AB_CD@.jar:
33
18
 % locale branding @AB_CD@ %locale/branding/
34
19
 # Unofficial branding only exists in en-US
35
20
   locale/branding/brand.dtd        (en-US/brand.dtd)
36
 
 * locale/branding/brand.properties (en-US/brand.properties)
37
 
Index: mozilla/browser/installer/package-manifest.in
38
 
===================================================================
39
 
--- mozilla.orig/browser/installer/package-manifest.in
40
 
+++ mozilla/browser/installer/package-manifest.in
41
 
@@ -368,16 +368,22 @@
42
 
 @BINPATH@/chrome/comm.jar
43
 
 @BINPATH@/chrome/comm.manifest
44
 
 @BINPATH@/chrome/reporter.jar
45
 
 @BINPATH@/chrome/reporter.manifest
46
 
 @BINPATH@/chrome/toolkit.jar
 
21
--- a/other-licenses/branding/firefox/locales/jar.mn
 
22
+++ b/other-licenses/branding/firefox/locales/jar.mn
 
23
@@ -1,6 +1,6 @@
 
24
 #filter substitution
 
25
 
 
26
-@AB_CD@.jar:
 
27
+browser-branding-@AB_CD@.jar:
 
28
 % locale branding @AB_CD@ %locale/branding/
 
29
   locale/branding/brand.dtd        (%brand.dtd)
 
30
 * locale/branding/brand.properties (%brand.properties)
 
31
--- a/browser/branding/nightly/locales/jar.mn
 
32
+++ b/browser/branding/nightly/locales/jar.mn
 
33
@@ -1,6 +1,6 @@
 
34
 #filter substitution
 
35
 
 
36
-@AB_CD@.jar:
 
37
+browser-branding-@AB_CD@.jar:
 
38
 % locale branding @AB_CD@ %locale/branding/
 
39
 # Nightly branding only exists in en-US
 
40
   locale/branding/brand.dtd        (en-US/brand.dtd)
 
41
--- a/browser/installer/package-manifest.in
 
42
+++ b/browser/installer/package-manifest.in
 
43
@@ -415,6 +415,11 @@
 
44
 @BINPATH@/chrome/toolkit@JAREXT@
47
45
 @BINPATH@/chrome/toolkit.manifest
48
 
 @BINPATH@/@PREF_DIR@/reporter.js
49
46
 #ifdef XP_UNIX
50
 
+; ubuntu official branding
51
 
+@BINPATH@/chrome/browser-branding.jar
 
47
+@BINPATH@/chrome/browser-branding@JAREXT@
52
48
+@BINPATH@/chrome/browser-branding.manifest
53
 
+@BINPATH@/chrome/browser-branding-en-US.jar
 
49
+@BINPATH@/chrome/browser-branding-en-US@JAREXT@
54
50
+@BINPATH@/chrome/browser-branding-en-US.manifest
55
 
+ 
56
 
 ; ubuntu awesome browser branding
57
 
 @BINPATH@/chrome/awesome-branding.jar
58
 
 @BINPATH@/chrome/awesome-branding.manifest
59
 
 @BINPATH@/chrome/awesome-branding-en-US.jar
60
 
 @BINPATH@/chrome/awesome-branding-en-US.manifest
 
51
+
61
52
 #ifndef XP_MACOSX
62
53
 @BINPATH@/chrome/icons/default/default16.png
63
54
 @BINPATH@/chrome/icons/default/default32.png
64
 
Index: mozilla/other-licenses/branding/firefox/content/jar.mn
65
 
===================================================================
66
 
--- mozilla.orig/other-licenses/branding/firefox/content/jar.mn
67
 
+++ mozilla/other-licenses/branding/firefox/content/jar.mn
68
 
@@ -1,7 +1,7 @@
69
 
-browser.jar:
70
 
+browser-branding.jar:
71
 
 % content branding %content/branding/ xpcnativewrappers=yes
72
 
   content/branding/about.png                     (about.png)
73
 
   content/branding/aboutCredits.png              (aboutCredits.png)
74
 
   content/branding/aboutFooter.png               (aboutFooter.png)
75
 
   content/branding/icon48.png                    (icon48.png)
76
 
   content/branding/icon64.png                    (icon64.png)
77
 
Index: mozilla/other-licenses/branding/firefox/locales/jar.mn
78
 
===================================================================
79
 
--- mozilla.orig/other-licenses/branding/firefox/locales/jar.mn
80
 
+++ mozilla/other-licenses/branding/firefox/locales/jar.mn
81
 
@@ -1,6 +1,6 @@
82
 
 #filter substitution
83
 
 
84
 
-@AB_CD@.jar:
85
 
+browser-branding-@AB_CD@.jar:
86
 
 % locale branding @AB_CD@ %locale/branding/
87
 
   locale/branding/brand.dtd        (%brand.dtd)
88
 
 * locale/branding/brand.properties (%brand.properties)
89
 
Index: mozilla/browser/branding/nightly/content/jar.mn
90
 
===================================================================
91
 
--- mozilla.orig/browser/branding/nightly/content/jar.mn
92
 
+++ mozilla/browser/branding/nightly/content/jar.mn
93
 
@@ -1,7 +1,7 @@
94
 
-browser.jar:
95
 
+browser-branding.jar:
96
 
 % content branding %content/branding/ xpcnativewrappers=yes
97
 
   content/branding/about.png                     (about.png)
98
 
   content/branding/aboutCredits.png              (aboutCredits.png)
99
 
   content/branding/aboutFooter.png               (aboutFooter.png)
100
 
   content/branding/icon48.png                    (icon48.png)
101
 
   content/branding/icon64.png                    (icon64.png)
102
 
Index: mozilla/browser/branding/nightly/locales/jar.mn
103
 
===================================================================
104
 
--- mozilla.orig/browser/branding/nightly/locales/jar.mn
105
 
+++ mozilla/browser/branding/nightly/locales/jar.mn
106
 
@@ -1,7 +1,7 @@
107
 
 #filter substitution
108
 
 
109
 
-@AB_CD@.jar:
110
 
+browser-branding-@AB_CD@.jar:
111
 
 % locale branding @AB_CD@ %locale/branding/
112
 
 # Nightly branding only exists in en-US
113
 
   locale/branding/brand.dtd        (en-US/brand.dtd)
114
 
 * locale/branding/brand.properties (en-US/brand.properties)
 
55
--- a/browser/branding/nightly/content/jar.mn
 
56
+++ b/browser/branding/nightly/content/jar.mn
 
57
@@ -1,4 +1,4 @@
 
58
-browser.jar:
 
59
+browser-branding.jar:
 
60
 % content branding %content/branding/ contentaccessible=yes
 
61
   content/branding/about.png                     (about.png)
 
62
   content/branding/about-logo.png                (about-logo.png)
 
63
--- a/browser/branding/unofficial/content/jar.mn
 
64
+++ b/browser/branding/unofficial/content/jar.mn
 
65
@@ -1,4 +1,4 @@
 
66
-browser.jar:
 
67
+browser-branding.jar:
 
68
 % content branding %content/branding/ contentaccessible=yes
 
69
   content/branding/about.png                     (about.png)
 
70
   content/branding/about-logo.png                (about-logo.png)
 
71
--- a/other-licenses/branding/firefox/content/jar.mn
 
72
+++ b/other-licenses/branding/firefox/content/jar.mn
 
73
@@ -1,4 +1,4 @@
 
74
-browser.jar:
 
75
+browser-branding.jar:
 
76
 % content branding %content/branding/ contentaccessible=yes
 
77
   content/branding/about.png                     (about.png)
 
78
   content/branding/about-logo.png                (about-logo.png)