[SCM] ardour Debian packaging branch, master, updated. debian/2.8.6-1-11-gab82003

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 20c5352165ba3f7a704707a83179fe5d6d6562ff
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun May 16 17:02:39 2010 +0200

    Strip old control.in rule clashing with extended CDBS use.

diff --git a/debian/rules b/debian/rules
index f7cb48a..ffdee12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,26 +21,6 @@ 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
-
-
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))

-- 
ardour Debian packaging