diff -r c0ae7c025b78 -r a9baaad57fa4 firefox-branded-icons.patch --- a/firefox-branded-icons.patch Fri Jun 08 08:05:14 2012 +0200 +++ b/firefox-branded-icons.patch Sat Jun 09 20:36:56 2012 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 9e165dc62d6ba0c3b2a82387a238fe5811acdc92 +# Parent 8e4bf8e8a79138350231e03dc567d893f67b2a29 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -160,16 +160,21 @@ endif +@@ -127,16 +127,21 @@ endif endif #} LIBXUL_SDK ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) @@ -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 -@@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \ +@@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \ firefox.icns \ disk.icns \ document.icns \ @@ -54,8 +54,8 @@ 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 -@@ -476,18 +476,21 @@ - @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png +@@ -496,18 +496,21 @@ + @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif