[SCM] Free Firewire Audio Drivers (ffado.org) packaging branch, master, updated. debian/2.0.0+svn1813-1-4-gcadb072

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d76a84655fbb3dacd0465cfc6fd36dc8d46a8667
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Apr 20 21:58:16 2010 +0200

    Tighten rules file: Drop unused debian/control target (clashing with CDBS package relation semi-auto-resolving), drop superfluous inclusion of CDBS class langcore.mk, and drop unused variables ALTIVEC_OPT_FLAGS and I686_OPT_FLAGS, and superfluous variables DEB_UPSTREAM_VERSION, DEB_UPSTREAM_TARBALL_VERSION and DEB_DESTDIR.

diff --git a/debian/rules b/debian/rules
index e57b0ba..550dc53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,34 +13,11 @@
 ### include the CDBS libraries ###
 
 #DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes 
-include /usr/share/cdbs/1/class/langcore.mk
 include /usr/share/cdbs/1/rules/buildcore.mk
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//')
-DEB_UPSTREAM_TARBALL_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+[^+]*$$//')
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk #Do we really need quilt if we have bzr?
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_CLEAN_EXCLUDE=debian/tmp
-DEB_DESTDIR = $(CURDIR)/debian/tmp/
-
-### set up the variables ###
-debian/control::
-ifneq ($(DEB_AUTO_UPDATE_DEBIAN_CONTROL),)
-	sed -e "s/@optarch@/altivec/g" -e "s/@basearch@/powerpc/g" \
-	< debian/opt-control.in >> debian/control
-	for i in debian/*-opt.* ; do \
-		j=`echo $$i | sed -e "s/-opt/-altivec/g"` ; \
-		sed -e "s/@optarch@/altivec/g" -e "s/@basearch@/powerpc/g" \
-			< $$i > $$j ; \
-	done
-	sed -e "s/@optarch@/i686/g" -e "s/@basearch@/i386/g" \
-	< debian/opt-control.in >> debian/control
-	for i in debian/*-opt.* ; do \
-		j=`echo $$i | sed -e "s/-opt/-i686/g"` ; \
-		sed -e "s/@optarch@/i686/g" -e "s/@basearch@/i386/g" \
-			< $$i > $$j ; \
-	done
-endif
 
 ### Add a soname ###
 
@@ -61,9 +38,6 @@ ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
 	NJOBS := -j$(PARALLEL_JOBS)
 endif
 
-ALTIVEC_OPT_FLAGS := -O3 -mcpu=7400 -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
-I686_OPT_FLAGS := -O3 -march=i686 -mmmx
-
 ifneq (,$(findstring power,$(DEB_BUILD_ARCH)))
 EXPLICIT_TARGET = DIST_TARGET=powerpc
 else ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))

-- 
Free Firewire Audio Drivers (ffado.org) packaging