diff -Nru gcc-mingw-w64-6/debian/changelog gcc-mingw-w64-6+rpi2/debian/changelog
--- gcc-mingw-w64-6/debian/changelog	2012-05-05 17:31:42.000000000 +0100
+++ gcc-mingw-w64-6+rpi2/debian/changelog	2012-05-26 12:19:46.000000000 +0100
@@ -1,3 +1,15 @@
+gcc-mingw-w64 (6+rpi2) wheezy; urgency=low
+
+  * Make build-depends changes in control.source as well as control
+
+ -- Peter Michael Green <plugwash@p10link.net>  Sat, 26 May 2012 11:18:25 +0000
+
+gcc-mingw-w64 (6+rpi1) wheezy; urgency=low
+
+  * Disable ada
+
+ -- Peter Michael Green <plugwash@p10link.net>  Sat, 26 May 2012 01:09:18 +0000
+
 gcc-mingw-w64 (6) unstable; urgency=low
 
   * Handle the different split-package versions in Ubuntu and Debian.
diff -Nru gcc-mingw-w64-6/debian/control gcc-mingw-w64-6+rpi2/debian/control
--- gcc-mingw-w64-6/debian/control	2012-05-05 19:08:48.000000000 +0100
+++ gcc-mingw-w64-6+rpi2/debian/control	2012-05-26 12:43:52.000000000 +0100
@@ -9,7 +9,6 @@
                debhelper (>= 7.0.50~),
                gcc-4.6 (>= 4.6.2-2),
                gcc-4.6-source (>= 4.6.2-2),
-               gnat-4.6,
                libcloog-ppl-dev,
                libelf-dev,
                libgmp-dev,
@@ -249,52 +248,6 @@
  This package contains the Objective-C++ compiler, supporting
  cross-compiling to 64-bit MinGW-w64 targets.
 
-Package: gnat-mingw-w64
-Architecture: all
-Depends: gnat-mingw-w64-i686, gnat-mingw-w64-x86-64, ${misc:Depends}
-Built-Using: gcc-4.6 (= ${gcc:Version})
-Description: GNU Ada compiler for MinGW-w64
- MinGW-w64 provides a development and runtime environment for 32- and
- 64-bit (x86 and x64) Windows applications using the Windows API and
- the GNU Compiler Collection (gcc).
- .
- This metapackage provides the Ada compiler, supporting
- cross-compiling to 32- and 64-bit MinGW-w64 targets.
-
-Package: gnat-mingw-w64-i686
-Architecture: any
-Depends: gcc-mingw-w64-i686 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Built-Using: gcc-4.6 (= ${gcc:Version})
-Breaks: gcc-mingw-w64 (<< ${split:Version})
-Replaces: gcc-mingw-w64 (<< ${split:Version})
-Suggests: gcc-4.6-locales (>= ${local:Version})
-Description: GNU Ada compiler for MinGW-w64 targeting Win32
- MinGW-w64 provides a development and runtime environment for 32- and
- 64-bit (x86 and x64) Windows applications using the Windows API and
- the GNU Compiler Collection (gcc).
- .
- This package contains the Ada compiler, supporting
- cross-compiling to 32-bit MinGW-w64 targets.
-
-Package: gnat-mingw-w64-x86-64
-Architecture: any
-Depends: gcc-mingw-w64-x86-64 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Built-Using: gcc-4.6 (= ${gcc:Version})
-Breaks: gcc-mingw-w64 (<< ${split:Version})
-Replaces: gcc-mingw-w64 (<< ${split:Version})
-Suggests: gcc-4.6-locales (>= ${local:Version})
-Description: GNU Ada compiler for MinGW-w64 targeting Win64
- MinGW-w64 provides a development and runtime environment for 32- and
- 64-bit (x86 and x64) Windows applications using the Windows API and
- the GNU Compiler Collection (gcc).
- .
- This package contains the Ada compiler, supporting
- cross-compiling to 64-bit MinGW-w64 targets.
-
 Package: gcc-mingw32
 Architecture: all
 Depends: binutils-mingw-w64-i686,
diff -Nru gcc-mingw-w64-6/debian/control.source gcc-mingw-w64-6+rpi2/debian/control.source
--- gcc-mingw-w64-6/debian/control.source	2012-05-05 11:35:09.000000000 +0100
+++ gcc-mingw-w64-6+rpi2/debian/control.source	2012-05-26 12:13:58.000000000 +0100
@@ -8,7 +8,6 @@
                debhelper (>= 7.0.50~),
                gcc-4.6 (>= 4.6.2-2),
                gcc-4.6-source (>= 4.6.2-2),
-               gnat-4.6,
                libcloog-ppl-dev,
                libelf-dev,
                libgmp-dev,
diff -Nru gcc-mingw-w64-6/debian/rules.full gcc-mingw-w64-6+rpi2/debian/rules.full
--- gcc-mingw-w64-6/debian/rules.full	2012-05-05 11:34:56.000000000 +0100
+++ gcc-mingw-w64-6+rpi2/debian/rules.full	2012-05-26 02:10:39.000000000 +0100
@@ -1,6 +1,7 @@
 # Build the full GCC.
 package := gcc-mingw-w64
-languages := c,c++,fortran,objc,obj-c++,ada
+languages := c,c++,fortran,objc,obj-c++
+
 BUILD_TARGET :=
 INSTALL_TARGET := install install-lto-plugin
 
diff -Nru gcc-mingw-w64-6/debian/rules.variant gcc-mingw-w64-6+rpi2/debian/rules.variant
--- gcc-mingw-w64-6/debian/rules.variant	2012-05-05 11:34:56.000000000 +0100
+++ gcc-mingw-w64-6+rpi2/debian/rules.variant	2012-05-26 02:10:39.000000000 +0100
@@ -1,6 +1,7 @@
 # Build the full GCC.
 package := gcc-mingw-w64
-languages := c,c++,fortran,objc,obj-c++,ada
+languages := c,c++,fortran,objc,obj-c++
+
 BUILD_TARGET :=
 INSTALL_TARGET := install install-lto-plugin