diff -u snd-11.2/debian/changelog snd-11.2/debian/changelog --- snd-11.2/debian/changelog +++ snd-11.2/debian/changelog @@ -1,3 +1,11 @@ +snd (11.2-2) unstable; urgency=low + + * Add snd-nox-oss runtime package. + * Disable building of snd-nox-alsa on kfreebsd-*, replace that package with + snd-nox-oss (Closes: #566779). + + -- Alessio Treglia Wed, 27 Jan 2010 14:36:30 +0100 + snd (11.2-1) unstable; urgency=low * New upstream release. diff -u snd-11.2/debian/control snd-11.2/debian/control --- snd-11.2/debian/control +++ snd-11.2/debian/control @@ -82,7 +82,7 @@ PulseAudio support. Package: snd-nox-alsa -Architecture: any +Architecture: alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc Depends: snd (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} @@ -98,0 +99,16 @@ + +Package: snd-nox-oss +Architecture: any +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 -u snd-11.2/debian/rules snd-11.2/debian/rules --- snd-11.2/debian/rules +++ snd-11.2/debian/rules @@ -17,13 +17,22 @@ 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 (,$(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 +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 # Clean the tree $(MAKE) distclean # then, build with PulseAudio @@ -35,7 +44,7 @@ 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 \ only in patch2: unchanged: --- snd-11.2.orig/debian/snd-nox-oss.install +++ snd-11.2/debian/snd-nox-oss.install @@ -0,0 +1,2 @@ +snd usr/bin +debian/snd.xpm usr/share/pixmaps only in patch2: unchanged: --- snd-11.2.orig/debian/snd-nox-oss.menu +++ snd-11.2/debian/snd-nox-oss.menu @@ -0,0 +1,7 @@ +?package(snd-nox-oss):\ + needs="text"\ + section="Applications/Sound"\ + title="Snd"\ + description="Sound file editor (No GUI)"\ + icon="/usr/share/pixmaps/snd.xpm"\ + command="/usr/bin/snd"