[Pkg-kde-commits] rev 2483 - branches/kde-3.4.0/packages/kdetoys/debian

[Luk Claes]

Author: luk
Date: 2005-12-01 15:46:53 +0000 (Thu, 01 Dec 2005)
New Revision: 2483

Modified:
   branches/kde-3.4.0/packages/kdetoys/debian/changelog
   branches/kde-3.4.0/packages/kdetoys/debian/control
   branches/kde-3.4.0/packages/kdetoys/debian/rules
Log:
reintroduce g++-3.4


Modified: branches/kde-3.4.0/packages/kdetoys/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/changelog	2005-12-01 15:41:21 UTC (rev 2482)
+++ branches/kde-3.4.0/packages/kdetoys/debian/changelog	2005-12-01 15:46:53 UTC (rev 2483)
@@ -7,10 +7,6 @@
   * Change doc-base section for all documentation to Games/Toys.
     (Closes: #335068)
 
-  +++ Changes by Adeodato Simó:
-
-  * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
-
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
 
 kdetoys (4:3.4.3-1) experimental; urgency=low

Modified: branches/kde-3.4.0/packages/kdetoys/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/control	2005-12-01 15:41:21 UTC (rev 2482)
+++ branches/kde-3.4.0/packages/kdetoys/debian/control	2005-12-01 15:46:53 UTC (rev 2483)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, kdelibs4-dev (>= 4:3.4.3), gawk, gettext, sharutils
+Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, kdelibs4-dev (>= 4:3.4.3), gawk, gettext, sharutils
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.6.2
 

Modified: branches/kde-3.4.0/packages/kdetoys/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/rules	2005-12-01 15:41:21 UTC (rev 2482)
+++ branches/kde-3.4.0/packages/kdetoys/debian/rules	2005-12-01 15:46:53 UTC (rev 2483)
@@ -5,5 +5,18 @@
 include debian/cdbs/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.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
+
+###
+
 DEB_INSTALL_CHANGELOGS_kodo := kodo/ChangeLog
 DEB_INSTALL_CHANGELOGS_kteatime := kteatime/ChangeLog