[SCM] Debian packaging for jack-audio-connection-kit branch, master.jackd2, updated. debian/1.9.4+svn3842-2-74-g05ced04

[js at users.alioth.debian.org]

The following commit has been merged in the master.jackd2 branch:
commit de29af953cb1f908290f53db68f00da0917efbd5
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Apr 3 21:35:33 2010 +0200

    Add patch 1002 fixing wscript files to support separately packaged waf 1.5.10.

diff --git a/debian/patches/1002_waf_wscript_update.patch b/debian/patches/1002_waf_wscript_update.patch
new file mode 100644
index 0000000..f69c59a
--- /dev/null
+++ b/debian/patches/1002_waf_wscript_update.patch
@@ -0,0 +1,59 @@
+From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
+Description: Fix wscript files to support separately packaged waf 1.5.10
+Last-Update: 2010-04-03
+--- a/common/wscript
++++ b/common/wscript
+@@ -64,7 +64,7 @@
+         'JackEngineProfiling.cpp',
+         ]
+ 
+-    includes = ['.', './jack', '..']
++    includes = ['.', './jack', '..', '../build/default']
+     uselib = ["PTHREAD"]
+ 
+     if bld.env['IS_LINUX']:
+--- a/example-clients/wscript
++++ b/example-clients/wscript
+@@ -61,7 +61,7 @@
+ 
+ def build(bld):
+     if bld.env['IS_LINUX']:
+-        os_incdir = ['../linux', '../posix']
++        os_incdir = ['../linux', '../posix', '../build/default']
+     if bld.env['IS_MACOSX']:
+         os_incdir = ['../macosx', '../posix']
+     if bld.env['IS_SUN']:
+--- a/linux/wscript
++++ b/linux/wscript
+@@ -19,7 +19,7 @@
+     driver.features.append('cc')
+     driver.env['shlib_PATTERN'] = 'jack_%s.so'
+     driver.defines = ['HAVE_CONFIG_H','SERVER_SIDE', 'HAVE_PPOLL']
+-    driver.includes = ['.', '../linux', '../posix', '../common', '../common/jack', '../dbus']
++    driver.includes = ['.', '../linux', '../posix', '../common', '../common/jack', '../dbus', '../build/default']
+     driver.target = target
+     driver.source = sources
+     driver.install_path = '${ADDON_DIR}/'
+@@ -31,7 +31,8 @@
+ def build(bld):
+     if bld.env['BUILD_JACKD'] == True:
+         jackd = bld.new_task_gen('cxx', 'program')
+-        jackd.includes = ['../linux', '../posix', '../common/jack', '../common', '../dbus']
++        jackd.features='cc cxx cprogram'
++        jackd.includes = ['../linux', '../posix', '../common/jack', '../common', '../dbus', '../build/default']
+         jackd.defines = 'HAVE_CONFIG_H'
+         jackd.source = ['../common/Jackdmp.cpp']
+ 	if bld.env['IS_LINUX'] and bld.env['BUILD_JACKDBUS']: 
+--- a/wscript
++++ b/wscript
+@@ -108,8 +108,8 @@
+     #   conf.check_tool('compiler_cxx')
+     #   conf.check_tool('compiler_cc')
+  
+-    conf.env.append_unique('CXXFLAGS', '-O3 -Wall')
+-    conf.env.append_unique('CCFLAGS', '-O3 -Wall')
++    conf.env.append_unique('CXXFLAGS', ["-O3", "-Wall"])
++    conf.env.append_unique('CCFLAGS', ["-O3", "-Wall"])
+ 
+     conf.sub_config('common')
+     if conf.env['IS_LINUX']:
diff --git a/debian/patches/series b/debian/patches/series
index 617c621..ab7587e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001_jackrec-rename.patch
 0002_manpages.patch
 1001_connect.patch
+1002_waf_wscript_update.patch

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