Mercurial Mercurial > hg > mozilla / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
firefox-branded-icons.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Wed, 30 Mar 2011 16:38:38 +0200
branchmozilla-2.0
changeset 252 5477a696d8f6
child 259 31beb466ca79
permissions -rw-r--r--
install all icons
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
252
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     1
 
# HG changeset patch
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     2
 
# Parent 33dfbc62844ac4883fbedb77d782a1b9ef5596c4
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     3
 
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     4
 
--- a/browser/app/Makefile.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     5
 
+++ b/browser/app/Makefile.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     6
 
@@ -281,16 +281,21 @@ endif
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     7
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     8
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     9
 
 libs::
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    10
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    11
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png   $(DIST)/bin/icons
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    12
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    13
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    14
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    15
 
+ifdef MOZ_OFFICIAL_BRANDING
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    16
 
+	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    17
 
+	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    18
 
+	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    19
 
+endif
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
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    22
 
 ifdef MOZ_SPLASHSCREEN
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    23
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    24
 
 libs::
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    25
 
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    26
 
 endif
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
 
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    29
 
--- a/browser/installer/package-manifest.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    30
 
+++ b/browser/installer/package-manifest.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    31
 
@@ -423,18 +423,21 @@
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    32
 
 #if MOZ_UPDATE_CHANNEL == beta
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    33
 
 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    34
 
 #endif
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    35
 
 @BINPATH@/chrome/toolkit@JAREXT@
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    36
 
 @BINPATH@/chrome/toolkit.manifest
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    37
 
 #ifdef XP_UNIX
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    38
 
 #ifndef XP_MACOSX
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    39
 
 @BINPATH@/chrome/icons/default/default16.png
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    40
 
+@BINPATH@/chrome/icons/default/default22.png
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    41
 
+@BINPATH@/chrome/icons/default/default24.png
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    42
 
 @BINPATH@/chrome/icons/default/default32.png
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    43
 
 @BINPATH@/chrome/icons/default/default48.png
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    44
 
+@BINPATH@/chrome/icons/default/default256.png
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    45
 
 #endif
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    46
 
 #endif
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    47
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
 
 ; shell icons
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    50
 
 #ifdef XP_UNIX
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    51
 
 #ifndef XP_MACOSX
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    52
 
 @BINPATH@/icons/*.xpm
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    53
 
diff --git a/other-licenses/branding/firefox/Makefile.in b/other-licenses/branding/firefox/Makefile.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    54
 
--- a/other-licenses/branding/firefox/Makefile.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    55
 
+++ b/other-licenses/branding/firefox/Makefile.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    56
 
@@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    57
 
 	firefox.icns \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    58
 
 	disk.icns \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    59
 
 	document.icns \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    60
 
 	dsstore \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    61
 
 	$(NULL)
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    62
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    63
 
 LINUX_BRANDING_FILES = \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    64
 
 	default16.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    65
 
+	default22.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    66
 
+	default24.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    67
 
 	default32.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    68
 
 	default48.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    69
 
+	default256.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    70
 
 	document.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    71
 
 	mozicon128.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    72
 
 	$(NULL)
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    73
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    74
 
 OS2_BRANDING_FILES = \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    75
 
 	firefox-os2.ico \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    76
 
 	document-os2.ico \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    77
 
 	$(NULL)
mozilla