diff -Nru protobuf-2.6.1/debian/changelog protobuf-2.6.1/debian/changelog
--- protobuf-2.6.1/debian/changelog	2015-08-06 06:48:15.000000000 +0000
+++ protobuf-2.6.1/debian/changelog	2015-08-26 20:38:00.000000000 +0000
@@ -1,3 +1,13 @@
+protobuf (2.6.1-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Disable optimization on mips and mipsel so that the tests pass.
+    To keep the g++-5 transition moving, optimization is completely
+    disabled here; someone who knows better can be more selective
+    later. (Mitigates: #796069)
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 26 Aug 2015 21:37:58 +0100
+
 protobuf (2.6.1-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru protobuf-2.6.1/debian/rules protobuf-2.6.1/debian/rules
--- protobuf-2.6.1/debian/rules	2015-07-29 15:26:56.000000000 +0000
+++ protobuf-2.6.1/debian/rules	2015-08-26 20:37:55.000000000 +0000
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
 
+ifneq (,$(filter mips mipsel,$(shell dpkg-architecture -qDEB_HOST_ARCH)))
+export DEB_CFLAGS_MAINT_APPEND = -O0
+export DEB_CXXFLAGS_MAINT_APPEND = -O0
+endif
+
+
 %:
 	dh $@ --with autoreconf,python2