diff -u p7zip-9.20.1~dfsg.1/debian/changelog p7zip-9.20.1~dfsg.1/debian/changelog
--- p7zip-9.20.1~dfsg.1/debian/changelog
+++ p7zip-9.20.1~dfsg.1/debian/changelog
@@ -1,3 +1,16 @@
+p7zip (9.20.1~dfsg.1-4+rpi2+deb7u1) wheezy-staging; urgency=medium
+
+  [changes brought forward from 9.20.1~dfsg.1-4+rpi1 by Mike Thompson <mpthompson@gmail.com> at Thu, 31 May 2012 23:53:29 -0700]
+  * Non-maintainer upload.
+  * Fixed a pointless 64 bit calculation that was giving the compiler grief.
+
+  [changes brought forward from 9.20.1~dfsg.1-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sat, 02 Mar 2013 03:13:12 +0000]
+  * Revert mpthompsons incorrect change (the 64-bit stuff is needed for
+    correct sign extension.
+  * Build with gcc/g++ 4.7 to avoid internal compiler error.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 27 Jul 2015 01:56:01 +0000
+
 p7zip (9.20.1~dfsg.1-4+deb7u1) wheezy-security; urgency=medium
 
   * Non-maintainer upload.
diff -u p7zip-9.20.1~dfsg.1/debian/control p7zip-9.20.1~dfsg.1/debian/control
--- p7zip-9.20.1~dfsg.1/debian/control
+++ p7zip-9.20.1~dfsg.1/debian/control
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Mohammed Adnène Trojette <adn+deb@diwi.org>
-Build-Depends: debhelper (>= 7), quilt, wx2.8-headers, libwxgtk2.8-dev (>= 2.8.12.1-4), dpkg-dev (>= 1.16.0)
+Build-Depends: debhelper (>= 7), quilt, wx2.8-headers, libwxgtk2.8-dev (>= 2.8.12.1-4), dpkg-dev (>= 1.16.0), gcc-4.7, g++-4.7
 Standards-Version: 3.9.2
 Homepage: http://p7zip.sourceforge.net/
 
only in patch2:
unchanged:
--- p7zip-9.20.1~dfsg.1.orig/makefile.linux_any_cpu_gcc_4.X
+++ p7zip-9.20.1~dfsg.1/makefile.linux_any_cpu_gcc_4.X
@@ -10,8 +10,8 @@
 	-D_7ZIP_LARGE_PAGES \
 	$(LOCAL_FLAGS)
 
-CXX=g++ $(ALLFLAGS) -DENV_HAVE_GCCVISIBILITYPATCH -fvisibility=hidden -fvisibility-inlines-hidden
-CC=gcc $(ALLFLAGS)
+CXX=g++-4.7 $(ALLFLAGS) -DENV_HAVE_GCCVISIBILITYPATCH -fvisibility=hidden -fvisibility-inlines-hidden
+CC=gcc-4.7 $(ALLFLAGS)
 CC_SHARED=-fPIC
 LINK_SHARED=-fPIC -shared