diff -u gcc-4.8-4.8.2/debian/changelog gcc-4.8-4.8.2/debian/changelog
--- gcc-4.8-4.8.2/debian/changelog
+++ gcc-4.8-4.8.2/debian/changelog
@@ -1,3 +1,11 @@
+gcc-4.8 (4.8.2-1+rpi1) jessie-staging; urgency=low
+
+  * Set defaults for raspbian (ARMv6+VFP)
+  * Disable testsuite
+  * Don't apply Ubuntu specific packages on unknown derivatives.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 02 Nov 2013 14:17:09 +0000
+
 gcc-4.8 (4.8.2-1) unstable; urgency=low
 
   * GCC 4.8.2 release.
diff -u gcc-4.8-4.8.2/debian/control gcc-4.8-4.8.2/debian/control
--- gcc-4.8-4.8.2/debian/control
+++ gcc-4.8-4.8.2/debian/control
@@ -235,7 +235,7 @@
   binutils (>= ${binutils:Version}), 
   libgcc-4.8-dev (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dep:libcdev}
-Suggests: ${gcc:multilib}, libmudflap0-4.8-dev (= ${gcc:Version}), gcc-4.8-doc (>= ${gcc:SoftVersion}), gcc-4.8-locales (>= ${gcc:SoftVersion}), libgcc1-dbg (>= ${libgcc:Version}), libgomp1-dbg (>= ${gcc:Version}), libitm1-dbg (>= ${gcc:Version}), libatomic1-dbg (>= ${gcc:Version}), libasan0-dbg (>= ${gcc:Version}), libtsan0-dbg (>= ${gcc:Version}), libbacktrace1-dbg (>= ${gcc:Version}), libquadmath0-dbg (>= ${gcc:Version}), libmudflap0-dbg (>= ${gcc:Version}), ${dep:libcloog}, ${dep:gold}
+Suggests: ${gcc:multilib}, libmudflap0-4.8-dev (= ${gcc:Version}), gcc-4.8-doc (>= ${gcc:SoftVersion}), gcc-4.8-locales (>= ${gcc:SoftVersion}), libgcc1-dbg (>= ${libgcc:Version}), libgomp1-dbg (>= ${gcc:Version}), libitm1-dbg (>= ${gcc:Version}), libatomic1-dbg (>= ${gcc:Version}), libasan0-dbg (>= ${gcc:Version}), libtsan0-dbg (>= ${gcc:Version}), libbacktrace1-dbg (>= ${gcc:Version}), libquadmath-dbg (>= ${gcc:Version}), libmudflap0-dbg (>= ${gcc:Version}), ${dep:libcloog}, ${dep:gold}
 Provides: c-compiler
 Description: GNU C compiler
  This is the GNU C compiler, a fairly portable optimizing compiler for C.
@@ -1795,28 +1795,6 @@
  .
  This compiler supports D language version 2.
 
-Package: libphobos-4.8-dev
-Architecture: amd64 i386 x32 kfreebsd-amd64 kfreebsd-i386
-Section: libdevel
-Priority: optional
-Depends: gcc-4.8-base (= ${gcc:Version}), zlib1g-dev, ${shlibs:Depends}, ${misc:Depends}
-Provides: libphobos-dev
-Description: Phobos D standard library
- This is the Phobos standard library that comes with the D2 compiler.
- .
- For more information check http://www.dlang.org/phobos/
-
-Package: libphobos-4.8-dbg
-Section: debug
-Architecture: amd64 i386 x32 kfreebsd-amd64 kfreebsd-i386
-Priority: extra
-Depends: gcc-4.8-base (= ${gcc:Version}), libphobos-4.8-dev (= ${gdc:Version}), ${misc:Depends}
-Provides: libphobos-dbg
-Description: The Phobos D standard library (debug symbols)
- This is the Phobos standard library that comes with the D2 compiler.
- .
- For more information check http://www.dlang.org/phobos/
-
 Package: gcc-4.8-soft-float
 Architecture: arm armel armhf
 Priority: optional
diff -u gcc-4.8-4.8.2/debian/rules.defs gcc-4.8-4.8.2/debian/rules.defs
--- gcc-4.8-4.8.2/debian/rules.defs
+++ gcc-4.8-4.8.2/debian/rules.defs
@@ -935,7 +935,7 @@
 with_ssp := $(call envfilt, ssp, , , $(with_ssp))
 
 ifeq ($(with_ssp),yes)
-  ifneq ($(distribution),Debian)
+  ifeq ($(distribution),Ubuntu)
     ifneq (,$(findstring gcc-4, $(PKGSOURCE)))
       with_ssp_default := yes
     endif
@@ -1158,7 +1158,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 gcc-4.8-4.8.2/debian/rules.patch gcc-4.8-4.8.2/debian/rules.patch
--- gcc-4.8-4.8.2/debian/rules.patch
+++ gcc-4.8-4.8.2/debian/rules.patch
@@ -99,7 +99,7 @@
 ifeq ($(with_ssp)-$(with_ssp_default),yes-yes)
   hardening_patches += gcc-default-ssp
 endif
-ifneq ($(distribution),Debian)
+ifeq ($(distribution),Ubuntu)
   ifneq (,$(findstring gcc-4, $(PKGSOURCE)))
     hardening_patches += \
 	gcc-default-format-security \
@@ -345,6 +345,7 @@
 # files (AUTO <dir> <auto-command with options>) and run them separately,
 # maybe only once per directory).
 $(patch_stamp): $(unpack_stamp) $(series_stamp)
+	echo GFDL_INVARIANT_FREE $(GFDL_INVARIANT_FREE)
 	QUILT_PATCHES=$(patchdir) \
 	  quilt --quiltrc /dev/null push -a || test $$? = 2
 
diff -u gcc-4.8-4.8.2/debian/rules2 gcc-4.8-4.8.2/debian/rules2
--- gcc-4.8-4.8.2/debian/rules2
+++ gcc-4.8-4.8.2/debian/rules2
@@ -403,9 +403,9 @@
     ifneq (,$(findstring gcj,$(PKGSOURCE)))
       with_arm_arch = armv6
     else
-      with_arm_arch = armv7-a
+      with_arm_arch = armv6
     endif
-    with_arm_fpu = vfpv3-d16
+    with_arm_fpu = vfp
   else
     # armel
     ifeq ($(distribution),Debian)
@@ -417,9 +417,9 @@
       ifneq (,$(findstring gcj,$(PKGSOURCE)))
         with_arm_arch = armv6
       else
-        with_arm_arch = armv7-a
+        with_arm_arch = armv6
       endif
-      with_arm_fpu = vfpv3-d16
+      with_arm_fpu = vfp
     else
       with_arm_arch = armv5t  # starting with quantal
     endif
@@ -430,7 +430,7 @@
   endif
   CONFARGS += --with-float=$(float_abi)
   ifeq ($(with_arm_thumb),yes)
-    CONFARGS += --with-mode=thumb
+    # CONFARGS += --with-mode=thumb
   endif
 endif