From 391574141f42df65ad991d4b7b224dd927ba3989 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Wed, 4 Aug 2010 12:42:58 +0200
Subject: [PATCH] sync rules.conf with gcc-4.5

---
 debian/rules.conf |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/rules.conf b/debian/rules.conf
index b691e34..a7399be 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -540,7 +540,12 @@ ifdef DEB_STAGE
   addons = cdev
 else
 languages = c c++ fortran objc objpp
-addons = cdev c++dev fdev objcdev objppdev
+ifeq ($(DEB_CROSS),yes)
+  addons = gccxbase
+else
+  addons = gccbase
+endif
+addons += cdev c++dev fdev objcdev source objppdev
 ifeq ($(with_libgcc),yes)
   addons += libgcc lib4gcc lib32gcc lib64gcc libn32gcc
 endif
@@ -566,11 +571,9 @@ ifeq ($(with_plugins),yes)
   addons += plugindev
 endif
 
-ifeq ($(DEB_CROSS),yes)
-  addons += gccxbase
-else
+ifneq ($(DEB_CROSS),yes)
   languages += ada java # pascal
-  addons += gccbase libgcj libgcjdev gcjdoc libgnat libs source multilib # libgmath libnof lib64gnat ssp
+  addons += libgcj libgcjdev gcjdoc libgnat libs source multilib # libgmath libnof lib64gnat ssp
 
   ifneq (,$(neon_archs))
     addons += libneongcc libneongomp libneonobjc libneongfortran libneoncxx
-- 
1.7.1