1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 716c063a34dc33046c36b49e3bd2b4ec867d2b5b |
2 # Parent ad0e2fcaa00769bc56cc2b58d1264209f8c32623 |
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 @@ -131,16 +131,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
7 @@ -132,16 +132,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
8 endif |
8 endif |
9 |
9 |
10 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
10 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
11 libs:: |
11 libs:: |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons |
27 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
27 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
28 libs:: $(srcdir)/profile/channel-prefs.js |
28 libs:: $(srcdir)/profile/channel-prefs.js |
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 @@ -42,18 +42,21 @@ OSX_BRANDING_FILES = \ |
32 @@ -47,18 +47,21 @@ BRANDING_FILES := \ |
33 firefox.icns \ |
|
34 disk.icns \ |
|
35 document.icns \ |
33 document.icns \ |
36 dsstore \ |
34 dsstore \ |
37 $(NULL) |
35 $(NULL) |
|
36 endif |
38 |
37 |
39 LINUX_BRANDING_FILES = \ |
38 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
|
39 BRANDING_FILES := \ |
40 default16.png \ |
40 default16.png \ |
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 mozicon128.png \ |
46 mozicon128.png \ |
47 $(NULL) |
47 $(NULL) |
|
48 endif |
48 |
49 |
49 OS2_BRANDING_FILES = \ |
50 ifeq ($(OS_ARCH),OS2) |
|
51 BRANDING_FILES := \ |
50 firefox-os2.ico \ |
52 firefox-os2.ico \ |
51 document-os2.ico \ |
53 document-os2.ico \ |
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 @@ -552,18 +552,21 @@ |
57 @@ -558,18 +558,21 @@ |
58 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
58 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
59 #ifdef SHIP_FEEDBACK |
59 #ifdef SHIP_FEEDBACK |
60 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
60 @BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi |
61 #endif |
61 #endif |
62 @BINPATH@/chrome/toolkit@JAREXT@ |
62 @BINPATH@/chrome/toolkit@JAREXT@ |
63 @BINPATH@/chrome/toolkit.manifest |
63 @BINPATH@/chrome/toolkit.manifest |
64 #ifdef MOZ_GTK2 |
64 #ifdef MOZ_GTK2 |
65 @BINPATH@/chrome/icons/default/default16.png |
65 @BINPATH@/browser/chrome/icons/default/default16.png |
66 +@BINPATH@/chrome/icons/default/default22.png |
66 +@BINPATH@/browser/chrome/icons/default/default22.png |
67 +@BINPATH@/chrome/icons/default/default24.png |
67 +@BINPATH@/browser/chrome/icons/default/default24.png |
68 @BINPATH@/chrome/icons/default/default32.png |
68 @BINPATH@/browser/chrome/icons/default/default32.png |
69 @BINPATH@/chrome/icons/default/default48.png |
69 @BINPATH@/browser/chrome/icons/default/default48.png |
70 +@BINPATH@/chrome/icons/default/default256.png |
70 +@BINPATH@/browser/chrome/icons/default/default256.png |
71 #endif |
71 #endif |
72 |
72 |
73 ; shell icons |
73 ; shell icons |
74 #ifdef XP_UNIX |
74 #ifdef XP_UNIX |
75 #ifndef XP_MACOSX |
75 #ifndef XP_MACOSX |
76 @BINPATH@/icons/*.xpm |
76 ; shell icons |
77 @BINPATH@/icons/*.png |
77 @BINPATH@/browser/icons/*.png |
78 #endif |
78 #ifdef MOZ_UPDATER |