diff -Nru iceweasel-24.5.0esr/debian/changelog iceweasel-24.5.0esr/debian/changelog --- iceweasel-24.5.0esr/debian/changelog 2014-04-29 14:41:45.000000000 +0000 +++ iceweasel-24.5.0esr/debian/changelog 2014-05-01 23:24:03.000000000 +0000 @@ -1,3 +1,10 @@ +iceweasel (24.5.0esr-1~deb7u1+rpi1) wheezy-staging; urgency=low + + * Build with gcc 4.7 to avoid ICE + * Fix clean target + + -- Peter Michael Green Fri, 21 Mar 2014 18:25:19 +0000 + iceweasel (24.5.0esr-1~deb7u1) stable-security; urgency=medium * New upstream release. diff -Nru iceweasel-24.5.0esr/debian/control iceweasel-24.5.0esr/debian/control --- iceweasel-24.5.0esr/debian/control 2014-04-29 14:48:45.000000000 +0000 +++ iceweasel-24.5.0esr/debian/control 2014-05-02 00:21:07.000000000 +0000 @@ -43,7 +43,9 @@ imagemagick, librsvg2-bin, xsltproc, - iso-codes + iso-codes, + gcc-4.7, + g++-4.7 Build-Conflicts: graphicsmagick-imagemagick-compat, liboss4-salsa-dev, libhildonmime-dev, diff -Nru iceweasel-24.5.0esr/debian/control.in iceweasel-24.5.0esr/debian/control.in --- iceweasel-24.5.0esr/debian/control.in 2014-04-29 14:41:45.000000000 +0000 +++ iceweasel-24.5.0esr/debian/control.in 2014-05-02 00:16:30.000000000 +0000 @@ -48,7 +48,9 @@ imagemagick, librsvg2-bin, xsltproc, - iso-codes + iso-codes, + gcc-4.7, + g++-4.7 Build-Conflicts: graphicsmagick-imagemagick-compat, liboss4-salsa-dev, libhildonmime-dev, diff -Nru iceweasel-24.5.0esr/debian/rules iceweasel-24.5.0esr/debian/rules --- iceweasel-24.5.0esr/debian/rules 2014-04-29 14:41:45.000000000 +0000 +++ iceweasel-24.5.0esr/debian/rules 2014-05-01 23:23:49.000000000 +0000 @@ -109,12 +109,12 @@ GENSYMBOLS_FLAGS := -c4 endif -ifeq (default,$(origin CC)) -CC := gcc -endif -ifeq (default,$(origin CXX)) -CXX := g++ -endif +#ifeq (default,$(origin CC)) +CC := gcc-4.7 +#endif +#ifeq (default,$(origin CXX)) +CXX := g++-4.7 +#endif CXXFLAGS = $(CFLAGS) EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS MOZILLA_OFFICIAL @@ -271,6 +271,7 @@ sed -i '2!b;/^exec "/ d' $$dir/$$file; \ done; \ done + rm -rf build-* override_dh_auto_install: stamps/install-$(PRODUCT) stamps/install-xulrunner