rev 4298 - trunk/packages/kdegraphics/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-08-06 19:49:58 +0000 (Sun, 06 Aug 2006)
New Revision: 4298

Modified:
   trunk/packages/kdegraphics/debian/changelog
   trunk/packages/kdegraphics/debian/control
   trunk/packages/kdegraphics/debian/rules
Log:
This should fix the kdegraphics builds on arm and alpha. I hope.


Modified: trunk/packages/kdegraphics/debian/changelog
===================================================================
--- trunk/packages/kdegraphics/debian/changelog	2006-08-06 19:38:24 UTC (rev 4297)
+++ trunk/packages/kdegraphics/debian/changelog	2006-08-06 19:49:58 UTC (rev 4298)
@@ -1,3 +1,15 @@
+kdegraphics (4:3.5.4-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_5_BRANCH update (up to r570455).
+
+  * Add libltdl3-dev to the build-depends.
+
+  * Build using gcc-4.0 on alpha, to work around a gcc-4.1 ICE (#381717).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun,  6 Aug 2006 15:45:30 -0400
+
 kdegraphics (4:3.5.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdegraphics/debian/control
===================================================================
--- trunk/packages/kdegraphics/debian/control	2006-08-06 19:38:24 UTC (rev 4297)
+++ trunk/packages/kdegraphics/debian/control	2006-08-06 19:49:58 UTC (rev 4298)
@@ -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>, Josh Metzler <joshdeb at metzlers.org>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.4), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
+Build-Depends: g++-4.0 [alpha], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.4), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: kdegraphics

Modified: trunk/packages/kdegraphics/debian/rules
===================================================================
--- trunk/packages/kdegraphics/debian/rules	2006-08-06 19:38:24 UTC (rev 4297)
+++ trunk/packages/kdegraphics/debian/rules	2006-08-06 19:49:58 UTC (rev 4298)
@@ -17,5 +17,18 @@
 DEB_DH_MAKESHLIBS_ARGS_kviewshell	:= -V'kviewshell (>= 4:3.5.4-1)'
 DEB_DH_MAKESHLIBS_ARGS_libkscan1	:= -V'libkscan1 (>= 4:3.5.4-1)'
 
+###
+
+GCC41_ICES_HERE := alpha
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC41_ICES_HERE)))
+    export CC=gcc-4.0
+    export CPP=cpp-4.0
+    export CXX=g++-4.0
+endif
+
+###
+
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))