[Pkg-kde-commits] rev 1701 - people/dato/packages/trunk/amarok/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-09-05 22:28:05 +0000 (Mon, 05 Sep 2005)
New Revision: 1701

Modified:
   people/dato/packages/trunk/amarok/debian/changelog
   people/dato/packages/trunk/amarok/debian/control
   people/dato/packages/trunk/amarok/debian/rules
Log:
Use g++ 3.4 for the glorious trio.


Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2005-09-05 21:15:38 UTC (rev 1700)
+++ people/dato/packages/trunk/amarok/debian/changelog	2005-09-05 22:28:05 UTC (rev 1701)
@@ -1,3 +1,9 @@
+amarok (1.3.1-2) unstable; urgency=low
+
+  * Use g++ 3.4 in arm, m68k and hppa.
+
+ -- Adeodato Simó <asp16 at alu.ua.es>  Tue, 06 Sep 2005 00:21:03 +0200
+
 amarok (1.3.1-1) unstable; urgency=low
 
   * New upstream bugfix release. Beware, though, that the GStreamer engine has

Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control	2005-09-05 21:15:38 UTC (rev 1700)
+++ people/dato/packages/trunk/amarok/debian/control	2005-09-05 22:28:05 UTC (rev 1701)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Adeodato Simó <asp16 at alu.ua.es>
-Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), bzip2, automake1.9, libtool, kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.4.2), kdebase-dev (>= 4:3.4.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient14-dev, libpq-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.21), debhelper (>> 4.1.0), bzip2, automake1.9, libtool, kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.4.2), kdebase-dev (>= 4:3.4.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient14-dev, libpq-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
 Standards-Version: 3.6.2
 
 Package: amarok

Modified: people/dato/packages/trunk/amarok/debian/rules
===================================================================
--- people/dato/packages/trunk/amarok/debian/rules	2005-09-05 21:15:38 UTC (rev 1700)
+++ people/dato/packages/trunk/amarok/debian/rules	2005-09-05 22:28:05 UTC (rev 1701)
@@ -22,6 +22,19 @@
 # See debian/TODO
 DEB_INSTALL_DOCS_ALL = $(filter-out $(DEB_INSTALL_CHANGELOGS_ALL),$(shell for f in README NEWS TODO BUGS AUTHORS THANKS; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; fi; done))
 
+###
+
+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
+
+###
+
 ### Libtool and Automake updates
 post-patches:: debian/stamp-autothings-update
 debian/stamp-autothings-update: