[SCM] Debian packaging for jack-audio-connection-kit branch, master.jackd2, updated. upstream/1.9.4+svn3842-25-gf738c92

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

The following commit has been merged in the master.jackd2 branch:
commit f738c9212a99be2b99a5b86b6830f0aeb85ccbf7
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri Dec 11 12:29:25 2009 +0100

    Enable mixed 32/64bit builds on amd64.
    
    Note that this changes the memory layout of the amd64 lib so it can be
    used with 32bit clients.
    
    The 32bit library itself isn't included in this package, it needs to be
    installed from the corresponding (that is, same version) i386 package.

diff --git a/debian/control b/debian/control
index 4dff907..a9fc4ad 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 7.0.0),
                 libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                 libfreebob0-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                 libffado-dev [amd64 i386 powerpc],
+                g++-multilib [amd64],
                 cdbs,
                 po-debconf,
                 libcelt-dev (>= 0.7.0),
diff --git a/debian/rules b/debian/rules
index a7e321c..e7122b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,13 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) ./waf configure --prefix=/usr && ./waf --destdir=$(CURDIR)/debian/tmp
+ifeq ($(DEB_BUILD_ARCH),amd64)
+	MIXED_FLAGS := --mixed
+else
+	MIXED_FLAGS :=
+endif
+
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) ./waf configure --prefix=/usr $(MIXED_FLAGS) && ./waf --destdir=$(CURDIR)/debian/tmp
 DEB_MAKE_INSTALL_TARGET = install
 
 DEB_DH_MAKESHLIBS_ARGS := -V -Xintime -Xinprocess -Xjack_alsa -Xjack_oss\

-- 
Debian packaging for jack-audio-connection-kit