[SCM] jackd2/master: Limit jackdbus to Linux platforms

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

The following commit has been merged in the master branch:
commit 4e70ea5187fb51511f2aa0e03ec013d2d9af1487
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed Jan 18 11:42:43 2012 +0100

    Limit jackdbus to Linux platforms
    
    The jackdbus code contains Linux specific instructions:
    
    in dbus/controller.c:
    
       struct sysinfo
       sysinfo()
    
    Both don't exist on kFreeBSD (and probably Hurd), so let's only enable
    it on Linux. man sysinfo also confirms that it is Linux specific.
    
    I've discussed it with upstream:
    
       http://trac.jackaudio.org/ticket/265
    
    We agreed to keep it unportable for now.

diff --git a/debian/rules b/debian/rules
index 6cf6007..e752bab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,8 @@ ABI = 0.118.0
 CFLAGS += -fvisibility=hidden
 CXXFLAGS += -fvisibility=hidden
 
-waf-configure-options = --prefix=/usr --classic --dbus
-waf-configure-options += $(if $(filter linux,$(DEB_HOST_ARCH_OS)),--alsa)
+waf-configure-options = --prefix=/usr --classic
+waf-configure-options += $(if $(filter linux,$(DEB_HOST_ARCH_OS)),--alsa --dbus)
 waf-configure-options += $(if $(filter amd64 i386 powerpc,$(DEB_HOST_ARCH)),--firewire)
 waf-configure-options += $(if $(filter i386,$(DEB_HOST_ARCH)),--mixed)
 

-- 
jackd2 packaging