Hi! On Sun, Mar 04, 2007 at 02:57:56PM -0300, Henrique de Moraes Holschuh wrote: > On Sun, 04 Mar 2007, Aurelien Jarno wrote: > > Any news about this bug? If you lack some time, I propose to do an NMU. > > Be my guest. But test it first, timidity is a bit finicky. >
Thanks. I have uploaded a NMU to DELAYED/3. The diff is attached. Bye, Aurelien -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' [EMAIL PROTECTED] | [EMAIL PROTECTED] `- people.debian.org/~aurel32 | www.aurel32.net
diff -u timidity-2.13.2/debian/changelog timidity-2.13.2/debian/changelog --- timidity-2.13.2/debian/changelog +++ timidity-2.13.2/debian/changelog @@ -1,3 +1,12 @@ +timidity (2.13.2-7.2) unstable; urgency=low + + * Non-maintainer upload with maintainer permission. + * Don't enable alsa on non-linux architectures. + * Don't build-depend on libasound2-dev on kfreebsd-i386, + * kfreebsd-amd64 and hurd-i386 (closes: #327689) + + -- Aurelien Jarno <[EMAIL PROTECTED]> Sun, 11 Mar 2007 01:29:56 +0100 + timidity (2.13.2-7.1) unstable; urgency=high * Non-maintainer upload. diff -u timidity-2.13.2/debian/control timidity-2.13.2/debian/control --- timidity-2.13.2/debian/control +++ timidity-2.13.2/debian/control @@ -2,7 +2,7 @@ Section: sound Priority: optional Maintainer: Henrique de Moraes Holschuh <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4), libasound2-dev, libaudiofile-dev, libesd0-dev, libarts1-dev, libjack0.100.0-dev, libaudio-dev, libvorbis-dev (>= 1.0.0-3), libspeex-dev (>= 1.0), liboggflac-dev (>= 1.1.2-1), libflac-dev (>= 1.1.2-1), libncurses-dev, libslang2-dev, libx11-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, x-dev, libxaw7-dev, tcl8.4-dev, tk8.4-dev, libgtk2.0-dev, autotools-dev +Build-Depends: debhelper (>= 4), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libesd0-dev, libarts1-dev, libjack0.100.0-dev, libaudio-dev, libvorbis-dev (>= 1.0.0-3), libspeex-dev (>= 1.0), liboggflac-dev (>= 1.1.2-1), libflac-dev (>= 1.1.2-1), libncurses-dev, libslang2-dev, libx11-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, x-dev, libxaw7-dev, tcl8.4-dev, tk8.4-dev, libgtk2.0-dev, autotools-dev Standards-Version: 3.6.2 Package: timidity diff -u timidity-2.13.2/debian/rules timidity-2.13.2/debian/rules --- timidity-2.13.2/debian/rules +++ timidity-2.13.2/debian/rules @@ -15,6 +15,7 @@ # Autotools export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -q-qDEB_BUILD_ARCH_OS) # FOR AUTOCONF 2.52 AND NEWER ONLY CONFFLAGS = @@ -36,6 +37,16 @@ CONFFLAGS += --enable-debug endif +# audio and interface +ifeq ($(DEB_BUILD_ARCH_OS), linux) +audio = default,oss,nas,arts,esd,jack,vorbis,flac,speex,alsa +interface = ncurses,emacs,xaw,alsaseq +else +audio = default,oss,nas,arts,esd,jack,vorbis,flac,speex +interface = ncurses,emacs,xaw +endif + + ## ## The rules ## @@ -55,9 +66,9 @@ --with-x \ --with-tcl-includes=/usr/include/tcl8.4 \ --with-tk-includes=/usr/include/tcl8.4 \ - --enable-audio=default,oss,alsa,nas,arts,esd,jack,vorbis,flac,speex \ + --enable-audio=$(audio) \ --with-default-output=default \ - --enable-interface=ncurses,emacs,xaw,alsaseq \ + --enable-interface=$(interface) \ --enable-dynamic=slang,tcltk,vt100,xskin,gtk \ --enable-server --enable-network --enable-spectrogram --enable-wrd $(MAKE)
