[Pkg-kde-commits] rev 2390 - branches/kde-3.4.0/packages/kdegraphics/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-11-28 16:18:37 +0000 (Mon, 28 Nov 2005)
New Revision: 2390

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

Modified: branches/kde-3.4.0/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/changelog	2005-11-28 07:20:02 UTC (rev 2389)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/changelog	2005-11-28 16:18:37 UTC (rev 2390)
@@ -6,10 +6,6 @@
 
   * Backport from KDE 3.5 a build fix for ksvg. (Closes: #338142)
 
-  +++ 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
 
 kdegraphics (4:3.4.3-1) experimental; urgency=low

Modified: branches/kde-3.4.0/packages/kdegraphics/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/control	2005-11-28 07:20:02 UTC (rev 2389)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/control	2005-11-28 16:18:37 UTC (rev 2390)
@@ -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, imlib11-dev, kdelibs4-dev (>= 4:3.4.3), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libpaper-dev, libopenexr-dev (>= 1.2.1), libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.4.3), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libpaper-dev, libopenexr-dev (>= 1.2.1), libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
 Standards-Version: 3.6.2
 
 Package: kdegraphics

Modified: branches/kde-3.4.0/packages/kdegraphics/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/rules	2005-11-28 07:20:02 UTC (rev 2389)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/rules	2005-11-28 16:18:37 UTC (rev 2390)
@@ -19,5 +19,16 @@
 
 ###
 
+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))'))