rev 4577 - trunk/packages/kdegraphics/debian

[Pierre Habouzit]

Author: madcoder
Date: 2006-10-01 21:07:06 +0000 (Sun, 01 Oct 2006)
New Revision: 4577

Modified:
   trunk/packages/kdegraphics/debian/control
   trunk/packages/kdegraphics/debian/rules
Log:
cleanse g++-4.0 things every where.



Modified: trunk/packages/kdegraphics/debian/control
===================================================================
--- trunk/packages/kdegraphics/debian/control	2006-10-01 20:57:54 UTC (rev 4576)
+++ trunk/packages/kdegraphics/debian/control	2006-10-01 21:07:06 UTC (rev 4577)
@@ -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>, Josh Metzler <joshdeb at metzlers.org>
-Build-Depends: g++-4.0 [alpha], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.5), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.5), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: kdegraphics

Modified: trunk/packages/kdegraphics/debian/rules
===================================================================
--- trunk/packages/kdegraphics/debian/rules	2006-10-01 20:57:54 UTC (rev 4576)
+++ trunk/packages/kdegraphics/debian/rules	2006-10-01 21:07:06 UTC (rev 4577)
@@ -17,18 +17,5 @@
 DEB_DH_MAKESHLIBS_ARGS_kviewshell	:= -V'kviewshell (>= 4:3.5.5-1)'
 DEB_DH_MAKESHLIBS_ARGS_libkscan1	:= -V'libkscan1 (>= 4:3.5.5-1)'
 
-###
-
-GCC41_ICES_HERE := alpha
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC41_ICES_HERE)))
-    export CC=gcc-4.0
-    export CPP=cpp-4.0
-    export CXX=g++-4.0
-endif
-
-###
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))