[pkg-kde-commits] rev 2923 - people/dato/packages/trunk/amarok/debian

[Adeodato Simó]

Author: adeodato
Date: 2006-01-17 20:23:16 +0000 (Tue, 17 Jan 2006)
New Revision: 2923

Modified:
   people/dato/packages/trunk/amarok/debian/changelog
   people/dato/packages/trunk/amarok/debian/control
   people/dato/packages/trunk/amarok/debian/rules
Log:
No more g++-3.4 for The Glorious Trio, damnit.


Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2006-01-17 20:20:52 UTC (rev 2922)
+++ people/dato/packages/trunk/amarok/debian/changelog	2006-01-17 20:23:16 UTC (rev 2923)
@@ -4,6 +4,9 @@
 
     + fetching lyrics works again. (Closes: #344509)
 
+  * Do not use g++-3.4 in arm, m68k and hppa anymore, sid's g++-4.0 is
+    expected to work. (Closes: #342953)
+
  -- Adeodato Simó <dato at net.com.org.es>  Tue, 17 Jan 2006 21:16:14 +0100
 
 amarok (1.3.7-1) unstable; urgency=low

Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control	2006-01-17 20:20:52 UTC (rev 2922)
+++ people/dato/packages/trunk/amarok/debian/control	2006-01-17 20:23:16 UTC (rev 2923)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Adeodato Simó <dato at net.com.org.es>
-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.3), kdebase-dev (>= 4:3.4.3), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient14-dev, libpq-dev, libtag1-dev (>> 1.4), libvisual0.2-dev, libsdl1.2-dev, libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
+Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), bzip2, automake1.9, libtool, kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.4.3), kdebase-dev (>= 4:3.4.3), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient14-dev, libpq-dev, libtag1-dev (>> 1.4), libvisual0.2-dev, libsdl1.2-dev, 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	2006-01-17 20:20:52 UTC (rev 2922)
+++ people/dato/packages/trunk/amarok/debian/rules	2006-01-17 20:23:16 UTC (rev 2923)
@@ -24,17 +24,6 @@
 
 ###
 
-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: