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

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

The following commit has been merged in the master branch:
commit 4ccb96a3938abaa6a81801bab68b9a886536be6c
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed Jan 27 14:35:30 2010 +0100

    Add snd-nox-oss runtime package.

diff --git a/debian/control b/debian/control
index cb1e26a..7f8ca40 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,7 @@ Description: Sound file editor (GTK+ user interface - PulseAudio)
  PulseAudio support.
 
 Package: snd-nox-alsa
-Architecture: any
+Architecture: !kfreebsd-i386 !kfreebsd-amd64
 Depends: snd (>= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
@@ -96,3 +96,19 @@ Description: Sound file editor (without X support - ALSA)
  the Scheme programming language.
  .
  This package contains a version of snd compiled without support for X.
+
+Package: snd-nox-oss
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: snd (>= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: snd-nox
+Conflicts: snd-dmotif, snd-dmotif-alsa, snd-smotif, snd-gtk-alsa,
+ snd-gtk (<< 11-3), snd-gtk-jack, snd-gtk-pulse
+Replaces: snd (<< 5.10), snd-dmotif, snd-dmotif-alsa, snd-smotif,
+ snd-gtk-alsa, snd-gtk (<< 11-3), snd-gtk-jack, snd-gtk-pulse
+Description: Sound file editor (without X support - OSS)
+ Snd is a powerful sound file editor that can be customized and extended using
+ the Scheme programming language.
+ .
+ This package contains a version of snd compiled without support for X.
diff --git a/debian/rules b/debian/rules
index 90c0afe..e640997 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,13 +17,24 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 override_dh_auto_build:
 override_dh_auto_install:
-	# First, build with ALSA but without GUI
+	# First, build with ALSA but without GUI (only on !kfreebsd-* archs)
+ifeq (DEB_BUILD_ARCH = kfreebsd)
+ifeq (,$(findstring :$(DEB_BUILD_ARCH):,:kfreebsd-i386:kfreebsd-amd64:))
 	./configure $(COMMON_CONFIGURE_ARGS) \
 									--with-no-gui \
 									--with-alsa
 	$(MAKE)
 	dh_install -psnd-nox-alsa
 	dh_installman -psnd-nox-alsa snd.1
+	# XOR build with OSS w/o GUI (only on kfreebsd-* archs)
+else
+	./configure $(COMMON_CONFIGURE_ARGS) \
+									--with-no-gui \
+									--with-oss
+	$(MAKE)
+	dh_install -psnd-nox-oss
+	dh_installman -psnd-nox-oss snd.1
+endif
 	# Clean the tree
 	$(MAKE) distclean
 	# then, build with PulseAudio
@@ -35,7 +46,7 @@ override_dh_auto_install:
 	dh_installman -psnd-gtk-pulse snd.1
 	# Clean the tree
 	$(MAKE) distclean
-	# finally, build with JACK
+	# build with JACK (only for {i386,amd64,powerpc} archs)
 ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:i386:powerpc:amd64:))
 	./configure $(COMMON_CONFIGURE_ARGS) \
 									--with-gtk \
diff --git a/debian/snd-gtk-jack.install b/debian/snd-nox-oss.install
similarity index 100%
copy from debian/snd-gtk-jack.install
copy to debian/snd-nox-oss.install
diff --git a/debian/snd-nox-alsa.menu b/debian/snd-nox-oss.menu
similarity index 86%
copy from debian/snd-nox-alsa.menu
copy to debian/snd-nox-oss.menu
index cee4c8f..c4aea4c 100644
--- a/debian/snd-nox-alsa.menu
+++ b/debian/snd-nox-oss.menu
@@ -1,4 +1,4 @@
-?package(snd-nox-alsa):\
+?package(snd-nox-oss):\
  needs="text"\
  section="Applications/Sound"\
  title="Snd"\

-- 
snd packaging