[Pkg-kde-commits] rev 2486 - branches/kde-3.4.0/packages/kdebindings/debian

[Luk Claes]

Author: luk
Date: 2005-12-01 16:20:46 +0000 (Thu, 01 Dec 2005)
New Revision: 2486

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


Modified: branches/kde-3.4.0/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-12-01 16:18:05 UTC (rev 2485)
+++ branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-12-01 16:20:46 UTC (rev 2486)
@@ -2,10 +2,6 @@
 
   * New upstream release.
 
-  +++ 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
 
 kdebindings (4:3.4.2-2) unstable; urgency=low

Modified: branches/kde-3.4.0/packages/kdebindings/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/control	2005-12-01 16:18:05 UTC (rev 2485)
+++ branches/kde-3.4.0/packages/kdebindings/debian/control	2005-12-01 16:20:46 UTC (rev 2486)
@@ -1,5 +1,5 @@
 Source: kdebindings
-Build-Depends: cdbs (>= 0.4.27), debhelper (>> 4.0.0), gawk, gettext, java-gcj-compat-dev [alpha amd64 i386 ia64 powerpc s390 sparc], kdelibs4-dev (>= 4:3.4.3), libgtk1.2-dev, python-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
+Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>> 4.0.0), gawk, gettext, java-gcj-compat-dev [alpha amd64 i386 ia64 powerpc s390 sparc], kdelibs4-dev (>= 4:3.4.3), libgtk1.2-dev, python-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
 Section: devel
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>

Modified: branches/kde-3.4.0/packages/kdebindings/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/rules	2005-12-01 16:18:05 UTC (rev 2485)
+++ branches/kde-3.4.0/packages/kdebindings/debian/rules	2005-12-01 16:20:46 UTC (rev 2486)
@@ -16,6 +16,17 @@
 
 ###
 
+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_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \
 		  	    DO_NOT_COMPILE='dcopperl kalyptus qtsharp xparts python'