mozilla: firefox-branded-icons.patch@6f30563d969e (annotated)

252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	1	# HG changeset patch
659 fa96cf6ffd14 Aurora 24 update Wolfgang Rosenauer <wr@rosenauer.org> parents: 653 diff changeset	2	# Parent 5defe7bd2f041c227fe4a65f8a90e6cc42a9a339
259 31beb466ca79 snapshot 20110411 Wolfgang Rosenauer <wr@rosenauer.org> parents: 252 diff changeset	3
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	4	diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	5	--- a/browser/app/Makefile.in
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	6	+++ b/browser/app/Makefile.in
659 fa96cf6ffd14 Aurora 24 update Wolfgang Rosenauer <wr@rosenauer.org> parents: 653 diff changeset	7	@@ -133,16 +133,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
612 3006d73ad2fa move on to Aurora 20 Wolfgang Rosenauer <wr@rosenauer.org> parents: 568 diff changeset	8	endif
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	9
659 fa96cf6ffd14 Aurora 24 update Wolfgang Rosenauer <wr@rosenauer.org> parents: 653 diff changeset	10	ifdef MOZ_WIDGET_GTK
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	11	libs::
568 2c74c5927ea2 first working Aurora 18 build Wolfgang Rosenauer <wr@rosenauer.org> parents: 484 diff changeset	12	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons
2c74c5927ea2 first working Aurora 18 build Wolfgang Rosenauer <wr@rosenauer.org> parents: 484 diff changeset	13	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default
2c74c5927ea2 first working Aurora 18 build Wolfgang Rosenauer <wr@rosenauer.org> parents: 484 diff changeset	14	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default
2c74c5927ea2 first working Aurora 18 build Wolfgang Rosenauer <wr@rosenauer.org> parents: 484 diff changeset	15	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	16	+ifdef MOZ_OFFICIAL_BRANDING
568 2c74c5927ea2 first working Aurora 18 build Wolfgang Rosenauer <wr@rosenauer.org> parents: 484 diff changeset	17	+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default
2c74c5927ea2 first working Aurora 18 build Wolfgang Rosenauer <wr@rosenauer.org> parents: 484 diff changeset	18	+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default
2c74c5927ea2 first working Aurora 18 build Wolfgang Rosenauer <wr@rosenauer.org> parents: 484 diff changeset	19	+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	20	+endif
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	21	endif
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	22
340 aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail) Wolfgang Rosenauer <wr@rosenauer.org> parents: 294 diff changeset	23	libs:: $(srcdir)/profile/prefs.js
568 2c74c5927ea2 first working Aurora 18 build Wolfgang Rosenauer <wr@rosenauer.org> parents: 484 diff changeset	24	$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
340 aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail) Wolfgang Rosenauer <wr@rosenauer.org> parents: 294 diff changeset	25
484 62b8d7fa9144 snapshot 2012061500 Wolfgang Rosenauer <wr@rosenauer.org> parents: 467 diff changeset	26	ifndef LIBXUL_SDK
462 2d86bdb4277f 14.0b6 (Aurora->Beta) Wolfgang Rosenauer <wr@rosenauer.org> parents: 438 diff changeset	27	# channel-prefs.js is handled separate from other prefs due to bug 756325
2d86bdb4277f 14.0b6 (Aurora->Beta) Wolfgang Rosenauer <wr@rosenauer.org> parents: 438 diff changeset	28	libs:: $(srcdir)/profile/channel-prefs.js
289 3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	29	diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	30	--- a/browser/branding/official/Makefile.in
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	31	+++ b/browser/branding/official/Makefile.in
650 e8c83b144fd1 22.0b4 update Wolfgang Rosenauer <wr@rosenauer.org> parents: 637 diff changeset	32	@@ -42,18 +42,21 @@ BRANDING_FILES := \
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	33	document.icns \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	34	dsstore \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	35	$(NULL)
637 73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	36	endif
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	37
637 73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	38	ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	39	BRANDING_FILES := \
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	40	default16.png \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	41	+ default22.png \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	42	+ default24.png \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	43	default32.png \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	44	default48.png \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	45	+ default256.png \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	46	mozicon128.png \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	47	$(NULL)
637 73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	48	endif
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	49
637 73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	50	ifeq ($(OS_ARCH),OS2)
73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	51	BRANDING_FILES := \
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	52	firefox-os2.ico \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	53	document-os2.ico \
289 3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	54	diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	55	--- a/browser/installer/package-manifest.in
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	56	+++ b/browser/installer/package-manifest.in
659 fa96cf6ffd14 Aurora 24 update Wolfgang Rosenauer <wr@rosenauer.org> parents: 653 diff changeset	57	@@ -571,18 +571,21 @@
653 38c67b6b2f37 Aurora 23 (20130616) Wolfgang Rosenauer <wr@rosenauer.org> parents: 650 diff changeset	58	@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
38c67b6b2f37 Aurora 23 (20130616) Wolfgang Rosenauer <wr@rosenauer.org> parents: 650 diff changeset	59	@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
289 3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	60	@BINPATH@/chrome/toolkit@JAREXT@
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	61	@BINPATH@/chrome/toolkit.manifest
650 e8c83b144fd1 22.0b4 update Wolfgang Rosenauer <wr@rosenauer.org> parents: 637 diff changeset	62	@BINPATH@/chrome/recording.manifest
e8c83b144fd1 22.0b4 update Wolfgang Rosenauer <wr@rosenauer.org> parents: 637 diff changeset	63	@BINPATH@/chrome/recording/*
659 fa96cf6ffd14 Aurora 24 update Wolfgang Rosenauer <wr@rosenauer.org> parents: 653 diff changeset	64	#ifdef MOZ_GTK
637 73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	65	@BINPATH@/browser/chrome/icons/default/default16.png
73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	66	+@BINPATH@/browser/chrome/icons/default/default22.png
73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	67	+@BINPATH@/browser/chrome/icons/default/default24.png
73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	68	@BINPATH@/browser/chrome/icons/default/default32.png
73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	69	@BINPATH@/browser/chrome/icons/default/default48.png
73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	70	+@BINPATH@/browser/chrome/icons/default/default256.png
289 3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	71	#endif
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	72
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	73	; shell icons
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	74	#ifdef XP_UNIX
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	75	#ifndef XP_MACOSX
637 73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	76	; shell icons
73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	77	@BINPATH@/browser/icons/*.png
73640b76d6c3 first building version of FF21 Wolfgang Rosenauer <wr@rosenauer.org> parents: 612 diff changeset	78	#ifdef MOZ_UPDATER

author	Wolfgang Rosenauer <wr@rosenauer.org>
	Sat, 26 Apr 2014 14:26:27 +0200
branch	firefox29
changeset 721	6f30563d969e
parent 659	fa96cf6ffd14
child 718	6cb1ac7cd223
permissions	-rw-r--r--