[Pkg-kde-commits] rev 2430 - branches/kde-3.4.0/packages/kdebase/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-11-30 00:13:52 +0000 (Wed, 30 Nov 2005)
New Revision: 2430

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


Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-11-29 22:26:45 UTC (rev 2429)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-11-30 00:13:52 UTC (rev 2430)
@@ -16,10 +16,6 @@
   * Backport a fix from KDE 3.5 for a bug that caused switching to
     Administrator mode in KControl to fail on occasion. (Closes: #306951)
 
-  +++ 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
 
 kdebase (4:3.4.3-2) experimental; urgency=low

Modified: branches/kde-3.4.0/packages/kdebase/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/control	2005-11-29 22:26:45 UTC (rev 2429)
+++ branches/kde-3.4.0/packages/kdebase/debian/control	2005-11-30 00:13:52 UTC (rev 2430)
@@ -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, kdelibs4-dev (>= 4:3.4.3), dbus-qt-1-dev (>= 0.23.4-8), libldap2-dev, libhal-dev, libhal-storage-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, xutils, xlibs-static-pic, libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, libxcomposite-dev, libxdamage-dev, sharutils, texinfo
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.4.3), dbus-qt-1-dev, libldap2-dev, libhal-dev, libhal-storage-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, xutils, xlibs-static-pic, libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, libxcomposite-dev, libxdamage-dev, sharutils, texinfo
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
 Build-Conflicts: nvidia-glx
 Standards-Version: 3.6.2

Modified: branches/kde-3.4.0/packages/kdebase/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/rules	2005-11-29 22:26:45 UTC (rev 2429)
+++ branches/kde-3.4.0/packages/kdebase/debian/rules	2005-11-30 00:13:52 UTC (rev 2430)
@@ -29,6 +29,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
+
+###
+
 #shlibs_ver = 4:3.4.3-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))