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

252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	1	# HG changeset patch
289 3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	2	# Parent 0a9fd1d7099ccdff12205e23f0d9bf4d93a328ee
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
289 3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	7	@@ -221,16 +221,21 @@ endif
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	8
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	9	ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	10	libs::
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	11	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	12	$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.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
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	23	ifdef MOZ_SPLASHSCREEN
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	24	ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	25	libs::
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	26	$(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	27	endif
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	28	endif
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
252 5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	32	@@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \
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	document.png \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	47	mozicon128.png \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	48	$(NULL)
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	49
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	50	OS2_BRANDING_FILES = \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	51	firefox-os2.ico \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	52	document-os2.ico \
5477a696d8f6 install all icons Wolfgang Rosenauer <wr@rosenauer.org> parents: diff changeset	53	$(NULL)
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
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	57	@@ -416,18 +416,21 @@
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	58	#ifdef SHIP_FEEDBACK
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	59	@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	60	#endif
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	61	@BINPATH@/chrome/toolkit@JAREXT@
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	62	@BINPATH@/chrome/toolkit.manifest
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	63	#ifdef XP_UNIX
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	64	#ifndef XP_MACOSX
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	#endif
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	73
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	74
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	75	; shell icons
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	76	#ifdef XP_UNIX
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	77	#ifndef XP_MACOSX
3c0dff7ca9c4 Update to version 6.0b1 Wolfgang Rosenauer <wr@rosenauer.org> parents: 259 diff changeset	78	@BINPATH@/icons/*.xpm

author	Wolfgang Rosenauer <wr@rosenauer.org>
	Fri, 08 Jul 2011 08:21:23 +0200
changeset 289	3c0dff7ca9c4
parent 259	31beb466ca79
child 294	5330447b83a3
permissions	-rw-r--r--