[Pkg-kde-commits] rev 2477 - branches/kde-3.4.0/packages/kdeutils/debian

[Luk Claes]

Author: luk
Date: 2005-12-01 11:02:28 +0000 (Thu, 01 Dec 2005)
New Revision: 2477

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


Modified: branches/kde-3.4.0/packages/kdeutils/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/changelog	2005-12-01 10:51:25 UTC (rev 2476)
+++ branches/kde-3.4.0/packages/kdeutils/debian/changelog	2005-12-01 11:02:28 UTC (rev 2477)
@@ -7,10 +7,6 @@
   * Improve ark's description by referring to it as a _graphical_ archiving
     tool. (Closes: #335839)
 
-  +++ 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
 
 kdeutils (4:3.4.3-1) experimental; urgency=low

Modified: branches/kde-3.4.0/packages/kdeutils/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/control	2005-12-01 10:51:25 UTC (rev 2476)
+++ branches/kde-3.4.0/packages/kdeutils/debian/control	2005-12-01 11:02:28 UTC (rev 2477)
@@ -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, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libkonq4-dev (>= 4:3.4.3), libsnmp9-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
+Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libkonq4-dev (>= 4:3.4.3), libsnmp9-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
 Standards-Version: 3.6.2
 
 Package: kdeutils

Modified: branches/kde-3.4.0/packages/kdeutils/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/rules	2005-12-01 10:51:25 UTC (rev 2476)
+++ branches/kde-3.4.0/packages/kdeutils/debian/rules	2005-12-01 11:02:28 UTC (rev 2477)
@@ -15,5 +15,18 @@
 DEB_DH_MAKESHLIBS_ARGS_kregexpeditor	:= -V'kregexpeditor (>= 4:3.4.3-1)'
 DEB_DH_MAKESHLIBS_ARGS_ksim		:= -V'ksim (>= 4:3.4.3-1)'
 
+###
+
+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
+
+###
+
 #shlibs_ver = 4:3.4.3-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))