[SCM] jackd2/master: Invoke waf-light instead of waf

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Wed Mar 6 13:50:37 UTC 2013


The following commit has been merged in the master branch:
commit a1b56695d2cf684163d3e9a4d37ab7d7956ff601
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed Mar 6 14:16:41 2013 +0100

    Invoke waf-light instead of waf
    
    We used to ship a symlink, but since we create ./waf-light from
    debian/patches/waf.patch, there's no longer ./waf.
    
    Adjust debian/rules accordingly.

diff --git a/debian/rules b/debian/rules
index d32b45f..9e3f8ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ waf-configure-options += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 waf-configure-options += $(if $(filter linux,$(DEB_HOST_ARCH_OS)),--alsa --dbus)
 waf-configure-options += $(if $(filter amd64 i386 powerpc,$(DEB_HOST_ARCH)),--firewire)
 
-DEB_MAKE_INVOKE = ./waf -v --destdir=$(CURDIR)/debian/tmp
+DEB_MAKE_INVOKE = ./waf-light -v --destdir=$(CURDIR)/debian/tmp
 DEB_MAKE_INSTALL_TARGET = install
 
 # TODO: use distclean and drop related clean target, when (or if)
@@ -74,7 +74,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-light configure $(waf-configure-options)
 	touch $@
 clean::
 	rm -f debian/stamp-waf-configure

-- 
jackd2 packaging



More information about the pkg-multimedia-commits mailing list