--- rules.defs.orig	2012-05-14 18:43:20.000000000 +0000
+++ rules.defs.tero	2012-05-14 18:40:32.000000000 +0000
@@ -265,14 +265,11 @@
 # FIXME: libjava is not ported for thumb, this hack only works for
 # separate gcj builds
 ifeq (,$(findstring gcj,$(PKGSOURCE)))
+  ifeq ($(distribution),Ubuntu)
+    with_arm_thumb := yes
+  endif
   ifeq ($(DEB_TARGET_ARCH),armhf)
     with_arm_thumb := yes
-  else
-    ifeq ($(distribution)-$(DEB_TARGET_ARCH),Ubuntu-armel)
-      ifneq (,$(filter $(distrelease),lucid maverick natty oneiric precise))
-        with_arm_thumb := yes
-      endif
-    endif
   endif
 endif
 
@@ -289,11 +286,7 @@
 ifeq ($(DEB_TARGET_ARCH),armhf)
   float_abi := hard
 else ifneq (,$(filter $(distribution)-$(DEB_TARGET_ARCH), Ubuntu-armel))
-  ifneq (,$(filter $(distrelease),lucid maverick natty oneiric precise))
-    float_abi := softfp
-  else
-    float_abi := soft
-  endif
+  float_abi := softfp
 else ifneq (,$(filter $(DEB_TARGET_ARCH), arm armel))
   float_abi := soft
 endif
@@ -399,12 +392,14 @@
 # Ada --------------------
 ada_no_cpus	:= m32r m68k sh3 sh3eb sh4 sh4eb
 ada_no_systems	:= 
-ada_no_cross	:= yes
+ada_no_cross	:= no
 ada_no_snap	:= no
-ifneq (,$(filter $(DEB_TARGET_ARCH),armhf m68k powerpcspe sh4 sparc64))
+ifneq (,$(filter $(DEB_TARGET_ARCH),m68k powerpcspe sh4 sparc64))
   ada_no_snap := yes
 endif
 
+with_ada := yes
+
 ifeq ($(with_dev),yes)
   ifneq ($(separate_lang),yes)
     with_ada := yes
@@ -422,11 +417,13 @@
 ifeq ($(ada_no_snap)-$(single_package),yes-yes)
   with_ada := disabled for snapshot build
 endif
-with_ada := $(call envfilt, ada, , , $(with_ada))
+# with_ada := $(call envfilt, ada, , , $(with_ada))
+with_ada := yes
 
 ifneq ($(single_package),yes)
   with_separate_gnat := yes
 endif
+with_separate_gnat := no
 ifeq ($(with_ada)-$(with_separate_gnat),yes-yes)
   ifneq (,$(findstring gnat,$(PKGSOURCE)))
     languages := c
@@ -438,6 +435,9 @@
   endif
 endif
 
+with_ada := yes
+with_libgnat := yes
+
 ifeq ($(with_ada),yes)
   enabled_languages += ada
   with_libgnat := yes
@@ -476,7 +476,8 @@
 ifneq (,$(findstring $(DEB_TARGET_ARCH_CPU),$(cxx_no_cpus)))
   with_cxx := disabled for cpu $(DEB_TARGET_ARCH_CPU)
 endif
-with_cxx := $(call envfilt, c++, obj-c++ java, , $(with_cxx))
+# with_cxx := $(call envfilt, c++, obj-c++ java, , $(with_cxx))
+with_cxx := no
 
 # Build all packages needed for C++ development
 ifeq ($(with_cxx),yes)
@@ -535,7 +536,8 @@
 ifeq ($(java_no_cross)-$(DEB_CROSS),yes-yes)
   with_java := diasbled for cross compiler package
 endif
-with_java := $(call envfilt, java, , c++, $(with_java))
+# with_java := $(call envfilt, java, , c++, $(with_java))
+with_java := no
 
 ifeq ($(with_java)-$(with_separate_libgcj),yes-yes)
   ifneq (,$(findstring gcj, $(PKGSOURCE)))
@@ -662,7 +664,8 @@
 ifeq ($(fortran_no_cross)-$(DEB_CROSS),yes-yes)
   with_fortran := diasbled for cross compiler package
 endif
-with_fortran := $(call envfilt, fortran, , , $(with_fortran))
+# with_fortran := $(call envfilt, fortran, , , $(with_fortran))
+with_fortran := no
 
 # Build all packages needed for Fortran development
 ifeq ($(with_fortran),yes)
@@ -697,7 +700,8 @@
 ifeq ($(objc_no_cross)-$(DEB_CROSS),yes-yes)
   with_objc := diasbled for cross compiler package
 endif
-with_objc := $(call envfilt, objc, obj-c++, , $(with_objc))
+# with_objc := $(call envfilt, objc, obj-c++, , $(with_objc))
+with_objc := no
 
 ifeq ($(with_objc),yes)
   # the ObjC runtime with garbage collection enabled needs the Boehm GC
@@ -736,7 +740,8 @@
 ifeq ($(objcxx_no_cross)-$(DEB_CROSS),yes-yes)
   with_objcxx := diasbled for cross compiler package
 endif
-with_objcxx := $(call envfilt, obj-c++, , c++ objc, $(with_objcxx))
+# with_objcxx := $(call envfilt, obj-c++, , c++ objc, $(with_objcxx))
+with_objcxx := no
 
 ifeq ($(with_objcxx),yes)
   enabled_languages += obj-c++
@@ -950,9 +955,9 @@
 endif
 
 # run testsuite ---------------
-with_check := yes
+#with_check := no
 # if you don't want to run the gcc testsuite, uncomment the next line
-#with_check := disabled by hand
+with_check := disabled by hand
 ifeq ($(with_base_only),yes)
   with_check := no
 endif
@@ -985,7 +990,7 @@
 ifneq ($(findstring nocheck, $(DEB_BUILD_OPTIONS)),)
   with_check := disabled by DEB_BUILD_OPTIONS
 endif
-with_check := disabled for this build
+#with_check := disabled for this build
 
 # not a dependency on all archs, but if available, use it for the testsuite
 ifneq (,$(wildcard /usr/bin/localedef))
@@ -1001,7 +1006,7 @@
 # multilib
 biarch_map := i686=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x s390x=s390 \
 		x86_64=i686 powerpc64=powerpc mips=mips64 mipsel=mips64el
-ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy sid dapper hardy jaunty karmic lucid))
+ifeq (,$(filter $(distrelease),lenny etch squeeze sid dapper hardy jaunty karmic lucid))
   biarch_map := $(subst i686=,i486=,$(biarch_map))
 endif
 ifeq ($(distribution),Ubuntu)
@@ -1197,11 +1202,6 @@
     biarchsf	:= disabled for D
   endif
 
-  ifeq ($(with_ada)-$(with_separate_gnat),yes-yes)
-    biarchhf	:= disabled for Ada
-    biarchsf	:= disabled for Ada
-  endif
-
 endif
 
 ifneq (,$(filter yes,$(biarch32) $(biarch64) $(biarchn32) $(biarchhf) $(biarchsf)))