[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/1.9.5.dfsg-10-11-g22489ca

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

The following commit has been merged in the master branch:
commit 115e7bf7e7ce5ad0ef2df1126c805489f6685fb6
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri May 7 18:51:02 2010 +0200

    Don't use external waf anymore.
    
    waf is going to be removed from Debian. We're the last package using it.
    Let's end this. ;)

diff --git a/debian/control.in b/debian/control.in
index 69cfbc1..4c6072c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>, Jonas Smedegaard <dr at jones.dk>
 Build-Depends: @cdbs@,
- waf,
  d-shlibs,
  doxygen,
  libsamplerate-dev,
diff --git a/debian/patches/1002_waf_wscript_update.patch b/debian/patches/1002_waf_wscript_update.patch
deleted file mode 100644
index f69c59a..0000000
--- a/debian/patches/1002_waf_wscript_update.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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/rules b/debian/rules
index 2b90ed2..3109c98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ 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)
 
-DEB_MAKE_INVOKE = waf -v --destdir=$(CURDIR)/debian/tmp
+DEB_MAKE_INVOKE = ./waf -v --destdir=$(CURDIR)/debian/tmp
 DEB_MAKE_INSTALL_TARGET = install
 
 # TODO: use distclean and drop related clean target, when (or if)
@@ -60,7 +60,7 @@ clean::
 common-configure-arch common-configure-indep:: common-configure-impl
 common-configure-impl:: debian/stamp-waf-configure
 debian/stamp-waf-configure:
-	waf configure $(waf-configure-options)
+	./waf configure $(waf-configure-options)
 	touch $@
 clean::
 	rm -f debian/stamp-waf-configure

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