[Pkg-voip-commits] r3000 - portaudio19/trunk/debian

[Mikael Magnusson]

Author: mikma-guest
Date: 2007-01-13 11:57:44 +0100 (Sat, 13 Jan 2007)
New Revision: 3000

Modified:
   portaudio19/trunk/debian/changelog
   portaudio19/trunk/debian/control
   portaudio19/trunk/debian/rules
Log:
* FTBFS on GNU/kFreeBSD  (due to unsatisfied Build-Depends on
  libasound2-dev) (Closes: #401052)

Modified: portaudio19/trunk/debian/changelog
===================================================================
--- portaudio19/trunk/debian/changelog	2007-01-13 10:44:13 UTC (rev 2999)
+++ portaudio19/trunk/debian/changelog	2007-01-13 10:57:44 UTC (rev 3000)
@@ -2,8 +2,10 @@
 
   * NOT RELEASED YET
   * debian/rules: add binary-indep
+  * FTBFS on GNU/kFreeBSD  (due to unsatisfied Build-Depends on
+    libasound2-dev) (Closes: #401052)
 
- -- Mikael Magnusson <mikma at users.sourceforge.net>  Sat, 13 Jan 2007 11:19:49 +0100
+ -- Mikael Magnusson <mikma at users.sourceforge.net>  Sat, 13 Jan 2007 11:50:50 +0100
 
 portaudio19 (19+svn20060825-1) unstable; urgency=low
 

Modified: portaudio19/trunk/debian/control
===================================================================
--- portaudio19/trunk/debian/control	2007-01-13 10:44:13 UTC (rev 2999)
+++ portaudio19/trunk/debian/control	2007-01-13 10:57:44 UTC (rev 3000)
@@ -4,7 +4,7 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>
 Build-Depends: debhelper (>= 4.0.0), dpatch, autotools-dev,
- libasound2-dev, libjack0.100.0-dev, doxygen
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack0.100.0-dev, doxygen
 Standards-Version: 3.7.2
 
 Package: libportaudio2
@@ -25,7 +25,7 @@
 Package: portaudio19-dev
 Section: devel
 Architecture: any
-Depends: libportaudio2 (= ${Source-Version}), libasound2-dev,
+Depends: libportaudio2 (= ${Source-Version}), ${alsa-dev},
  libjack0.100.0-dev
 Conflicts: libportaudio-dev, libportaudio19-dev, libportaudio-19-dev
 Replaces: libportaudio19-dev, libportaudio-19-dev

Modified: portaudio19/trunk/debian/rules
===================================================================
--- portaudio19/trunk/debian/rules	2007-01-13 10:44:13 UTC (rev 2999)
+++ portaudio19/trunk/debian/rules	2007-01-13 10:57:44 UTC (rev 3000)
@@ -12,6 +12,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 
 CFLAGS = -Wall -g -D_REENTRANT
@@ -25,6 +26,13 @@
 	INSTALL_PROGRAM += -s
 endif
 
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+	CONFIGURE_SOUND_ARGS = --with-oss=yes --with-jack=yes --with-alsa=yes
+	DH_GENCONTROL_ARGS = -- -Valsa-dev="libasound2-dev"
+else
+	CONFIGURE_SOUND_ARGS = --with-oss=yes --with-jack=yes --with-alsa=no
+endif
+
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
@@ -43,7 +51,7 @@
 config: patch config.status
 config.status:
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-oss=yes --with-jack=yes --with-alsa=yes --enable-cxx
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-cxx $(CONFIGURE_SOUND_ARGS)
 
 
 build: config build-stamp
@@ -113,7 +121,7 @@
 	dh_makeshlibs -a -V 'libportaudio2 (>= 19+cvs20060311-1)'
 	dh_installdeb -a
 	dh_shlibdeps -a
-	dh_gencontrol -a
+	dh_gencontrol -a $(DH_GENCONTROL_ARGS)
 	dh_md5sums -a
 	dh_builddeb -a