1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 0a9fd1d7099ccdff12205e23f0d9bf4d93a328ee |
2 # Parent 6948d58326d5c2e46936e186079421e7d76445e2 |
3 |
3 |
4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
5 --- a/browser/app/Makefile.in |
5 --- a/browser/app/Makefile.in |
6 +++ b/browser/app/Makefile.in |
6 +++ b/browser/app/Makefile.in |
7 @@ -221,16 +221,21 @@ endif |
7 @@ -199,16 +199,21 @@ DEFINES += -DMOZILLA_OFFICIAL |
|
8 endif |
8 |
9 |
9 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
10 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
10 libs:: |
11 libs:: |
11 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons |
|
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default |
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default |
14 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default |
14 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default |
15 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default |
15 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default |
16 +ifdef MOZ_OFFICIAL_BRANDING |
16 +ifdef MOZ_OFFICIAL_BRANDING |
17 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(DIST)/bin/chrome/icons/default |
17 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(DIST)/bin/chrome/icons/default |
27 endif |
27 endif |
28 endif |
28 endif |
29 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in |
29 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in |
30 --- a/browser/branding/official/Makefile.in |
30 --- a/browser/branding/official/Makefile.in |
31 +++ b/browser/branding/official/Makefile.in |
31 +++ b/browser/branding/official/Makefile.in |
32 @@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \ |
32 @@ -69,18 +69,21 @@ OSX_BRANDING_FILES = \ |
33 firefox.icns \ |
33 firefox.icns \ |
34 disk.icns \ |
34 disk.icns \ |
35 document.icns \ |
35 document.icns \ |
36 dsstore \ |
36 dsstore \ |
37 $(NULL) |
37 $(NULL) |
41 + default22.png \ |
41 + default22.png \ |
42 + default24.png \ |
42 + default24.png \ |
43 default32.png \ |
43 default32.png \ |
44 default48.png \ |
44 default48.png \ |
45 + default256.png \ |
45 + default256.png \ |
46 document.png \ |
|
47 mozicon128.png \ |
46 mozicon128.png \ |
48 $(NULL) |
47 $(NULL) |
49 |
48 |
50 OS2_BRANDING_FILES = \ |
49 OS2_BRANDING_FILES = \ |
51 firefox-os2.ico \ |
50 firefox-os2.ico \ |
52 document-os2.ico \ |
51 document-os2.ico \ |
53 $(NULL) |
52 $(NULL) |
|
53 |
54 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
54 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
55 --- a/browser/installer/package-manifest.in |
55 --- a/browser/installer/package-manifest.in |
56 +++ b/browser/installer/package-manifest.in |
56 +++ b/browser/installer/package-manifest.in |
57 @@ -416,18 +416,21 @@ |
57 @@ -421,18 +421,21 @@ |
58 #ifdef SHIP_FEEDBACK |
58 #ifdef SHIP_FEEDBACK |
59 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
59 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
60 #endif |
60 #endif |
61 @BINPATH@/chrome/toolkit@JAREXT@ |
61 @BINPATH@/chrome/toolkit@JAREXT@ |
62 @BINPATH@/chrome/toolkit.manifest |
62 @BINPATH@/chrome/toolkit.manifest |