[pkg-kde-commits] rev 2683 - branches/kde-3.4.0/packages/kdemultimedia/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2005-12-20 01:25:36 +0000 (Tue, 20 Dec 2005)
New Revision: 2683

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:
Just in case another kdemultimedia upload is needed, m68k won't fail.


Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/changelog	2005-12-20 00:25:43 UTC (rev 2682)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/changelog	2005-12-20 01:25:36 UTC (rev 2683)
@@ -1,3 +1,11 @@
+kdemultimedia (4:3.4.3-6) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * No longer use gcc-3.4 to build on any architectures.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdemultimedia (4:3.4.3-5) unstable; urgency=low
 
   +++ Changes by Christopher Martin:

Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/control	2005-12-20 00:25:43 UTC (rev 2682)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/control	2005-12-20 01:25:36 UTC (rev 2683)
@@ -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: g++-3.4 [arm m68k], 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: 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-12-20 00:25:43 UTC (rev 2682)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/rules	2005-12-20 01:25:36 UTC (rev 2683)
@@ -25,18 +25,5 @@
 DEB_DH_MAKESHLIBS_ARGS_libarts1-mpeglib	:= -V'libarts1-mpeglib (>= 4:3.4.3-1)'
 DEB_DH_MAKESHLIBS_ARGS_kdemultimedia-kio-plugins := -V'kdemultimedia-kio-plugins (>= 4:3.4.3-1)'
 
-###
-
-GCC4_ICES_HERE := arm m68k
-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))'))