diff -u gcj-4.6-4.6.3/debian/rules.parameters gcj-4.6-4.6.3/debian/rules.parameters
--- gcj-4.6-4.6.3/debian/rules.parameters
+++ gcj-4.6-4.6.3/debian/rules.parameters
@@ -2,15 +2,15 @@
 GCC_VERSION	:= 4.6.3
 NEXT_GCC_VERSION	:= 4.6.4
 BASE_VERSION	:= 4.6
-SOURCE_VERSION	:= 4.6.3-1
-DEB_VERSION	:= 4.6.3-1
-DEB_EVERSION	:= 1:4.6.3-1
+SOURCE_VERSION	:= 4.6.3-1+rpi1
+DEB_VERSION	:= 4.6.3-1+rpi1
+DEB_EVERSION	:= 1:4.6.3-1+rpi1
 GDC_BASE_VERSION  := 
 DEB_GDC_VERSION	:= 
 DEB_SOVERSION	:= 4.6
 DEB_SOEVERSION	:= 1:4.6
 DEB_LIBGCC_SOVERSION	:= 1:4.6
-DEB_LIBGCC_VERSION	:= 1:4.6.3-1
+DEB_LIBGCC_VERSION	:= 1:4.6.3-1+rpi1
 DEB_STDCXX_SOVERSION	:= 4.6
 DEB_GCJ_SOVERSION	:= 4.6
 PKG_GCJ_EXT	:= 12
@@ -28,7 +28,7 @@
 MUDFLAP_SONAME	:= 0
 SSP_SONAME	:= 0
 GOMP_SONAME	:= 1
-QMATH_SONAME	:= 0
+QMATH_SONAME	:= 
 GCCMATH_SONAME	:= 
 GO_SONAME		:= 0
 LIBC_DEP		:= libc6
diff -u gcj-4.6-4.6.3/debian/rules2 gcj-4.6-4.6.3/debian/rules2
--- gcj-4.6-4.6.3/debian/rules2
+++ gcj-4.6-4.6.3/debian/rules2
@@ -348,9 +348,9 @@
     ifneq (,$(findstring gcj,$(PKGSOURCE)))
       CONFARGS += --with-arch=armv6
     else
-      CONFARGS += --with-arch=armv7-a
+      CONFARGS += --with-arch=armv6
     endif
-    CONFARGS += --with-float=$(float_abi) --with-fpu=vfpv3-d16
+    CONFARGS += --with-float=$(float_abi) --with-fpu=vfp
   else
     # Debian armel
     CONFARGS += --with-arch=armv4t --with-float=$(float_abi)
diff -u gcj-4.6-4.6.3/debian/rules.defs gcj-4.6-4.6.3/debian/rules.defs
--- gcj-4.6-4.6.3/debian/rules.defs
+++ gcj-4.6-4.6.3/debian/rules.defs
@@ -944,7 +944,7 @@
 # run testsuite ---------------
 with_check := yes
 # if you don't want to run the gcc testsuite, uncomment the next line
-#with_check := disabled by hand
+with_check := disabled by plugwash
 ifeq ($(with_base_only),yes)
   with_check := no
 endif
diff -u gcj-4.6-4.6.3/debian/changelog gcj-4.6-4.6.3/debian/changelog
--- gcj-4.6-4.6.3/debian/changelog
+++ gcj-4.6-4.6.3/debian/changelog
@@ -1,3 +1,10 @@
+gcj-4.6 (4.6.3-1+rpi1) wheezy; urgency=low
+
+  * Set configuration settings appropriately for raspian
+  * Disable testsuite
+
+ -- Peter Michael Green <plugwash@p10link.net>  Fri, 04 May 2012 17:02:06 +0000
+
 gcj-4.6 (4.6.3-1) unstable; urgency=low
 
   * GCC 4.6.3 release.