diff -Nru libavg-1.7.1/debian/changelog libavg-1.7.1/debian/changelog
--- libavg-1.7.1/debian/changelog	2012-06-14 20:10:52.000000000 +0100
+++ libavg-1.7.1/debian/changelog	2012-07-28 14:42:07.000000000 +0100
@@ -1,3 +1,11 @@
+libavg (1.7.1-1+rpi1) wheezy-staging; urgency=low
+
+  * change architecture to any
+  * conditionalise some x86 specific debug code (replacing it with a deliberate
+    segfault)
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 27 Jul 2012 23:46:04 +0000
+
 libavg (1.7.1-1) unstable; urgency=low
 
   * New maintainer
diff -Nru libavg-1.7.1/debian/control libavg-1.7.1/debian/control
--- libavg-1.7.1/debian/control	2012-06-14 20:11:50.000000000 +0100
+++ libavg-1.7.1/debian/control	2012-07-28 00:45:51.000000000 +0100
@@ -31,7 +31,7 @@
 Standards-Version: 3.9.3
 
 Package: python-libavg
-Architecture: amd64 i386
+Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Description: High-level development platform for media-centric applications
diff -Nru libavg-1.7.1/debian/patches/conditionalise-x86-asm.patch libavg-1.7.1/debian/patches/conditionalise-x86-asm.patch
--- libavg-1.7.1/debian/patches/conditionalise-x86-asm.patch	1970-01-01 01:00:00.000000000 +0100
+++ libavg-1.7.1/debian/patches/conditionalise-x86-asm.patch	2012-07-28 14:41:03.000000000 +0100
@@ -0,0 +1,17 @@
+--- libavg-1.7.1.orig/src/base/Exception.cpp
++++ libavg-1.7.1/src/base/Exception.cpp
+@@ -67,8 +67,13 @@ void debugBreak()
+ {
+ #ifdef _WIN32
+     __asm int 3;
+-#else
++#elseifdef __x86_64
++    asm("int $3");
++#elseifdef __i386__
+     asm("int $3");
++#else
++    //deliberately dereferencing a null pointer should break in most debuggers
++    *((char *)0) = 0;
+ #endif
+ }
+ 
diff -Nru libavg-1.7.1/debian/patches/series libavg-1.7.1/debian/patches/series
--- libavg-1.7.1/debian/patches/series	2012-06-14 20:10:52.000000000 +0100
+++ libavg-1.7.1/debian/patches/series	2012-07-28 14:36:47.000000000 +0100
@@ -1,2 +1,3 @@
 0001-do-not-build-tests-by-default.patch
 ftbfs-gcc4.7.patch
+conditionalise-x86-asm.patch