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

252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	1	# HG changeset patch
484 62b8d7fa9144 snapshot 2012061500 Wolfgang Rosenauer <wr@rosenauer.org> parents: 467 diff changeset	2	# Parent 7272ee3a4df832b885fec122f02d32f23dcc9cdb
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
467 a9baaad57fa4 refreshed patches and removed obsolete ones Wolfgang Rosenauer <wr@rosenauer.org> parents: 462 diff changeset	7	@@ -127,16 +127,21 @@ endif
438 7d934b2f5014 rebased and removed upstreamed and obsolete patches Wolfgang Rosenauer <wr@rosenauer.org> parents: 419 diff changeset	8	endif #} LIBXUL_SDK
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	9
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	10	ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	11	libs::
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	12	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	13	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	14	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	15	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	16	+ifdef MOZ_OFFICIAL_BRANDING
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	17	+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	18	+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	19	+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(DIST)/bin/chrome/icons/default
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
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail) Wolfgang Rosenauer <wr@rosenauer.org> parents: 294 diff changeset	24	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
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
467 a9baaad57fa4 refreshed patches and removed obsolete ones Wolfgang Rosenauer <wr@rosenauer.org> parents: 462 diff changeset	32	@@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	33	firefox.icns \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	34	disk.icns \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	35	document.icns \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	36	dsstore \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	37	$(NULL)
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	38
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	39	LINUX_BRANDING_FILES = \
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)
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	48
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	49	OS2_BRANDING_FILES = \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	50	firefox-os2.ico \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	51	document-os2.ico \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	52	$(NULL)
294 5330447b83a3 update to aurora (6.99 / 20110721) Wolfgang Rosenauer <wr@rosenauer.org> parents: 289 diff changeset	53
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
467 a9baaad57fa4 refreshed patches and removed obsolete ones Wolfgang Rosenauer <wr@rosenauer.org> parents: 462 diff changeset	57	@@ -496,18 +496,21 @@
a9baaad57fa4 refreshed patches and removed obsolete ones Wolfgang Rosenauer <wr@rosenauer.org> parents: 462 diff changeset	58	@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
289 3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	59	#ifdef SHIP_FEEDBACK
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	60	@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	61	#endif
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	62	@BINPATH@/chrome/toolkit@JAREXT@
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	63	@BINPATH@/chrome/toolkit.manifest
409 ff30593d2daa switch to 12.0dev Wolfgang Rosenauer <wr@rosenauer.org> parents: 382 diff changeset	64	#ifdef MOZ_GTK2
289 3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	65	@BINPATH@/chrome/icons/default/default16.png
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	66	+@BINPATH@/chrome/icons/default/default22.png
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	67	+@BINPATH@/chrome/icons/default/default24.png
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	68	@BINPATH@/chrome/icons/default/default32.png
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	69	@BINPATH@/chrome/icons/default/default48.png
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	70	+@BINPATH@/chrome/icons/default/default256.png
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
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	76	@BINPATH@/icons/*.xpm
409 ff30593d2daa switch to 12.0dev Wolfgang Rosenauer <wr@rosenauer.org> parents: 382 diff changeset	77	@BINPATH@/icons/*.png
ff30593d2daa switch to 12.0dev Wolfgang Rosenauer <wr@rosenauer.org> parents: 382 diff changeset	78	#endif

author	Wolfgang Rosenauer <wr@rosenauer.org>
	Thu, 19 Jul 2012 20:44:57 +0200
changeset 506	f02147953485
parent 484	62b8d7fa9144
child 568	2c74c5927ea2
permissions	-rw-r--r--