[Pkg-kde-commits] rev 2434 - branches/kde-3.4.0/packages/kdemultimedia/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-11-30 01:15:57 +0000 (Wed, 30 Nov 2005)
New Revision: 2434

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

Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/changelog	2005-11-30 00:27:04 UTC (rev 2433)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/changelog	2005-11-30 01:15:57 UTC (rev 2434)
@@ -10,10 +10,6 @@
   * Add a manpage for kaudiocreator, courtesy of Francois Wendling.
     (Closes: #337166)
 
-  +++ 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
 
 kdemultimedia (4:3.4.3-3) experimental; urgency=low

Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/control	2005-11-30 00:27:04 UTC (rev 2433)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/control	2005-11-30 01:15:57 UTC (rev 2434)
@@ -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, cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.1-3), libgstreamer-plugins0.8-dev, libltdl3-dev, liboggflac-dev (>= 1.1.1-3), libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libtunepimp-bin, libtunepimp2-dev (>= 0.3.0-9.1), libxaw8-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.1-3), libgstreamer-plugins0.8-dev, libltdl3-dev, liboggflac-dev (>= 1.1.1-3), libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libtunepimp-bin, libtunepimp2-dev (>= 0.3.0-9.1), libxaw8-dev, libxine-dev, sharutils, texinfo, libxxf86dga-dev
 Standards-Version: 3.6.2
 
 Package: kdemultimedia

Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/rules	2005-11-30 00:27:04 UTC (rev 2433)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/rules	2005-11-30 01:15:57 UTC (rev 2434)
@@ -27,5 +27,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))'))