diff -r cef565f1c325 -r 6cb1ac7cd223 firefox-branded-icons.patch --- a/firefox-branded-icons.patch Mon Apr 14 09:09:11 2014 +0200 +++ b/firefox-branded-icons.patch Thu Apr 17 23:33:07 2014 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 5defe7bd2f041c227fe4a65f8a90e6cc42a9a339 +# Parent ab6659ccbfbbfed31bce1bcd696a820069b9d7c0 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -133,16 +133,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d +@@ -76,16 +76,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifdef MOZ_WIDGET_GTK @@ -29,7 +29,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in -@@ -42,18 +42,21 @@ BRANDING_FILES := \ +@@ -36,18 +36,21 @@ BRANDING_FILES := \ document.icns \ dsstore \ $(NULL) @@ -47,14 +47,14 @@ $(NULL) endif - ifeq ($(OS_ARCH),OS2) - BRANDING_FILES := \ - firefox-os2.ico \ - document-os2.ico \ + BRANDING_DEST := $(DIST)/branding + BRANDING_TARGET := export + INSTALL_TARGETS += BRANDING + diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -571,18 +571,21 @@ +@@ -611,18 +611,21 @@ @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @BINPATH@/chrome/toolkit@JAREXT@