[SCM] snd packaging branch, master, updated. debian/11.2-1-12-g138af3c

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

The following commit has been merged in the master branch:
commit 138af3cfbb06c732a58d02a4680438f5db8c8d28
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Thu Jan 28 10:34:22 2010 +0100

    Drop snd-nox-oss, now build only one single snd-nox runtime.

diff --git a/debian/rules b/debian/rules
index 3bef2a9..584d518 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,22 @@
 #!/usr/bin/make -f
 
-DEBIAN_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
 COMMON_CONFIGURE_ARGS=--with-ladspa \
 				--enable-snd-debug \
 				--with-gmp \
 				--prefix=/usr
 
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+EXTRA_CONFIGURE_ARGS=--with-alsa
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+EXTRA_CONFIGURE_ARGS=--with-oss
+endif
+
 %:
 	dh --with quilt $@
 
@@ -17,41 +28,36 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 override_dh_auto_build:
 override_dh_auto_install:
-	# First, build with ALSA but without GUI (only on !kfreebsd-* archs)
-ifeq (,$(findstring :$(DEB_BUILD_ARCH):,:kfreebsd-i386:kfreebsd-amd64:))
-	./configure $(COMMON_CONFIGURE_ARGS) \
-									--with-no-gui \
-									--with-alsa
+	# First, build without GUI
+	./configure $(COMMON_CONFIGURE_ARGS)    \
+			$(EXTRA_CONFIGURE_ARGS) \
+			--with-no-gui
 	$(MAKE)
-	dh_install -psnd-nox-alsa
-	dh_installman -psnd-nox-alsa snd.1
-endif
-	# build with OSS w/o GUI
-	./configure $(COMMON_CONFIGURE_ARGS) \
-									--with-no-gui \
-									--with-oss
-	$(MAKE)
-	dh_install -psnd-nox-oss
-	dh_installman -psnd-nox-oss snd.1
+	dh_install -psnd-nox
+	dh_installman -psnd-nox snd.1
 	# Clean the tree
 	$(MAKE) distclean
+
 	# then, build with PulseAudio
 	./configure $(COMMON_CONFIGURE_ARGS) \
-									--with-gtk \
-									--with-pulseaudio
+			--with-gtk \
+			--with-pulseaudio
 	$(MAKE)
 	dh_install -psnd-gtk-pulse
 	dh_installman -psnd-gtk-pulse snd.1
 	# Clean the tree
 	$(MAKE) distclean
-	# build with JACK (only for {i386,amd64,powerpc} archs)
-ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:i386:powerpc:amd64:))
+
+	# finally, build with JACK
+ifneq (,$(findstring :$(DEB_HOST_ARCH_CPU):,:i386:powerpc:amd64:))
 	./configure $(COMMON_CONFIGURE_ARGS) \
-									--with-gtk \
-									--with-jack
+			--with-gtk \
+			--with-jack
 	$(MAKE)
 	dh_install -psnd-gtk-jack
 	dh_installman -psnd-gtk-jack snd.1
+	# Clean the tree
+	$(MAKE) distclean
 endif
 
 override_dh_install:

-- 
snd packaging