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

[Adeodato Simó]

Author: adeodato
Date: 2005-09-16 13:22:07 +0000 (Fri, 16 Sep 2005)
New Revision: 1803

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:
GCC 3.4 for kdegraphics in arm, m68k and hppa.


Modified: branches/kde-3.4.0/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/changelog	2005-09-15 02:02:56 UTC (rev 1802)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/changelog	2005-09-16 13:22:07 UTC (rev 1803)
@@ -1,3 +1,11 @@
+kdegraphics (4:3.4.2-2) unstable; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Use gcc-3.4 on arm, m68k and hppa, where gcc-4.0 ICEs.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 16 Sep 2005 15:18:03 +0200
+
 kdegraphics (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: branches/kde-3.4.0/packages/kdegraphics/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdegraphics/debian/control	2005-09-15 02:02:56 UTC (rev 1802)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/control	2005-09-16 13:22:07 UTC (rev 1803)
@@ -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ó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.4.2), 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.2), 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-09-15 02:02:56 UTC (rev 1802)
+++ branches/kde-3.4.0/packages/kdegraphics/debian/rules	2005-09-16 13:22:07 UTC (rev 1803)
@@ -17,5 +17,18 @@
 DEB_DH_MAKESHLIBS_ARGS_kviewshell	:= -V'kviewshell (>= 4:3.4.2-1)'
 DEB_DH_MAKESHLIBS_ARGS_libkscan1	:= -V'libkscan1 (>= 4:3.4.2-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.2-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))