[SCM] jackd2/master: Drop mixed 32/64bit build option on amd64

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

The following commit has been merged in the master branch:
commit 564f2ebc666657dc7692f1c1d07cc5fd0a6b22b3
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Dec 5 17:50:24 2011 +0100

    Drop mixed 32/64bit build option on amd64
    
    We're aiming for multiarch, so the final solution is to use the 32bit
    library from i386, not from the package itself.

diff --git a/debian/rules b/debian/rules
index 5fcbb16..3ab7b34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,6 @@ CXXFLAGS += -fvisibility=hidden
 waf-configure-options = --prefix=/usr --classic --dbus
 waf-configure-options += $(if $(filter linux,$(DEB_HOST_ARCH_OS)),--alsa)
 waf-configure-options += $(if $(filter amd64 i386 powerpc,$(DEB_HOST_ARCH)),--firewire)
-waf-configure-options += $(if $(filter amd64,$(DEB_HOST_ARCH)),--mixed)
 waf-configure-options += $(if $(filter i386,$(DEB_HOST_ARCH)),--mixed)
 
 DEB_MAKE_INVOKE = ./waf -v --destdir=$(CURDIR)/debian/tmp

-- 
jackd2 packaging