[SCM] ardour3/master: Build for i686 instead of i386 to enable SSE

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f29c2bba5465d8aa948eb77c4c083470d993cd3e
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sat Oct 5 11:54:08 2013 +0200

    Build for i686 instead of i386 to enable SSE
    
    Upstream's wscript always includes lib/ardour/sse_*, even if dist_target
    is i386. However, since -msse isn't set for i386, we end up with an
    FTBFS.
    
    So we have the following options:
    
       a) fix the wscript or
       b) build for i686 instead
    
    a) is a bit more work but allows for potentially more users (those
    without SSE-enabled CPUs).
    
    b) is straight-forward and results in optimised builds, something the
    majority of real-world ardour users wants.
    
    For the time being, I choose b). We can still do a) later if necessary.

diff --git a/debian/rules b/debian/rules
index adaf4fe..d023678 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^\./waf|\./debian/(changelog|copyright(|_hint
 
 DIST_TARGET = none
 ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))
-	DIST_TARGET = i386
+	DIST_TARGET = i686
 endif
 ifneq (,$(findstring amd64,$(DEB_BUILD_ARCH)))
 	DIST_TARGET = x86_64

-- 
ardour3 packaging