diff -Nru iceweasel-31.2.0esr/debian/changelog iceweasel-31.2.0esr/debian/changelog --- iceweasel-31.2.0esr/debian/changelog 2014-10-18 01:38:43.000000000 +0000 +++ iceweasel-31.2.0esr/debian/changelog 2014-10-19 12:10:34.000000000 +0000 @@ -1,3 +1,10 @@ +iceweasel (31.2.0esr-2~deb7u1+rpi1) wheezy-staging; urgency=low + + * Build with gcc 4.7 to avoid ICE + * Fix clean target + + -- Peter Michael Green Sun, 19 Oct 2014 12:10:10 +0000 + iceweasel (31.2.0esr-2~deb7u1) stable-security; urgency=medium * debian/control*, debian/rules: Do not build depend on gstreamer 1.0 when diff -Nru iceweasel-31.2.0esr/debian/control iceweasel-31.2.0esr/debian/control --- iceweasel-31.2.0esr/debian/control 2014-10-18 02:15:47.000000000 +0000 +++ iceweasel-31.2.0esr/debian/control 2014-10-19 13:40:39.000000000 +0000 @@ -46,7 +46,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-31.2.0esr/debian/control.in iceweasel-31.2.0esr/debian/control.in --- iceweasel-31.2.0esr/debian/control.in 2014-10-18 01:37:52.000000000 +0000 +++ iceweasel-31.2.0esr/debian/control.in 2014-10-19 12:10:34.000000000 +0000 @@ -58,7 +58,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-31.2.0esr/debian/rules iceweasel-31.2.0esr/debian/rules --- iceweasel-31.2.0esr/debian/rules 2014-10-18 01:37:52.000000000 +0000 +++ iceweasel-31.2.0esr/debian/rules 2014-10-19 13:40:28.000000000 +0000 @@ -108,17 +108,12 @@ GENSYMBOLS_FLAGS := -c4 endif -ifeq (default,$(origin CC)) -CC := gcc -endif -ifeq (default,$(origin CXX)) -CXX := g++ -endif - -ifneq (,$(filter armhf,$(DEB_BUILD_ARCH))) -CC := gcc-4.9 -CXX := g++-4.9 -endif +#ifeq (default,$(origin CC)) +CC := gcc-4.7 +#endif +#ifeq (default,$(origin CXX)) +CXX := g++-4.7 +#endif CXXFLAGS = $(CFLAGS) @@ -262,6 +257,9 @@ sed -i '2!b;/^exec "/ d' $$dir/$$file; \ done; \ done + rm -rf build-* + rm -rf python/psutil/build + rm -f python/psutil/*.so override_dh_auto_install: stamps/install-$(PRODUCT)