[Pkg-kde-commits] rev 2438 - trunk/packages/koffice/debian

[Isaac Clerencia]

Author: isaac
Date: 2005-11-30 10:14:57 +0000 (Wed, 30 Nov 2005)
New Revision: 2438

Modified:
   trunk/packages/koffice/debian/control
   trunk/packages/koffice/debian/rules
Log:
Revert 2328, build again with g++-3.4 in the GT


Modified: trunk/packages/koffice/debian/control
===================================================================
--- trunk/packages/koffice/debian/control	2005-11-30 03:05:04 UTC (rev 2437)
+++ trunk/packages/koffice/debian/control	2005-11-30 10:14:57 UTC (rev 2438)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ben Burton <bab at debian.org>, Luk Claes <luk at debian.org>, Isaac Clerencia <isaac at debian.org>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), flex, kdelibs4-dev (>= 4:3.2.0), libaspell-dev, libfontconfig1-dev, libmagick++9-dev, libpaper-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, libwpd8-dev
+Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>= 4.2.30), flex, kdelibs4-dev (>= 4:3.2.0), libaspell-dev, libfontconfig1-dev, libmagick++9-dev, libpaper-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, libwpd8-dev
 Standards-Version: 3.6.1
 
 Package: koffice

Modified: trunk/packages/koffice/debian/rules
===================================================================
--- trunk/packages/koffice/debian/rules	2005-11-30 03:05:04 UTC (rev 2437)
+++ trunk/packages/koffice/debian/rules	2005-11-30 10:14:57 UTC (rev 2438)
@@ -4,6 +4,17 @@
 include debian/cdbs/debian-qt-kde.mk
 include debian/cdbs/simple-patchsys.mk
 
+###
+
+GCC4_ICES_HERE := arm m68k hppa
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
+    export CC=gcc-3.4
+    export CPP=cpp-3.4
+    export CXX=g++-3.4
+endif
+
 PACKAGES_WITH_LIBS := karbon kchart kivio koffice-libs krita kspread kugar
 
 DEB_INSTALL_CHANGELOGS_karbon := karbon/CHANGES