r37 - trunk/packages/libao/debian

[Adeodato Simó]

Author: adeodato
Date: 2006-01-17 22:02:26 +0000 (Tue, 17 Jan 2006)
New Revision: 37

Modified:
   trunk/packages/libao/debian/changelog
   trunk/packages/libao/debian/control
   trunk/packages/libao/debian/rules
Log:
Fix !linux FTBFS. Upload 0.8.6-3.


Modified: trunk/packages/libao/debian/changelog
===================================================================
--- trunk/packages/libao/debian/changelog	2006-01-17 01:33:37 UTC (rev 36)
+++ trunk/packages/libao/debian/changelog	2006-01-17 22:02:26 UTC (rev 37)
@@ -1,3 +1,12 @@
+libao (0.8.6-3) unstable; urgency=low
+
+  * Fix FTBFS on kFreeBSD and Hurd (closes: #272373):
+    + don't build-depend on libasound2-dev on kfreebsd-i386 and hurd-i386.
+    + pass "--exclude usr/lib/ao/plugins-2/libalsa09." to dh_install if
+      DEB_HOST_ARCH_OS is not linux.
+
+ -- Adeodato Simó <dato at net.com.org.es>  Tue, 17 Jan 2006 23:01:05 +0100
+
 libao (0.8.6-2) unstable; urgency=low
 
   * Switch maintenance to the Debian Xiph.org Maintainers (alioth/pkg-xiph).

Modified: trunk/packages/libao/debian/control
===================================================================
--- trunk/packages/libao/debian/control	2006-01-17 01:33:37 UTC (rev 36)
+++ trunk/packages/libao/debian/control	2006-01-17 22:02:26 UTC (rev 37)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xiph.org Maintainers <pkg-xiph-maint at lists.alioth.debian.org>
 Uploaders: Christopher L Cheney <ccheney at debian.org>, Adeodato Simó <dato at net.com.org.es>
-Build-Depends: autotools-dev, debhelper, quilt, libartsc0-dev, libasound2-dev, libaudio-dev, libesd0-dev, libxt-dev, libxau-dev
+Build-Depends: autotools-dev, debhelper, quilt, libartsc0-dev, libasound2-dev [!kfreebsd-i386 !hurd-i386], libaudio-dev, libesd0-dev, libxt-dev, libxau-dev
 Standards-Version: 3.6.2
 
 Package: libao2

Modified: trunk/packages/libao/debian/rules
===================================================================
--- trunk/packages/libao/debian/rules	2006-01-17 01:33:37 UTC (rev 36)
+++ trunk/packages/libao/debian/rules	2006-01-17 22:02:26 UTC (rev 37)
@@ -36,6 +36,16 @@
 
 ###
 
+# Support non-Linux ports
+
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifneq (linux,$(DEB_HOST_ARCH_OS))
+    DH_INSTALL_EXCLUDE := --exclude usr/lib/ao/plugins-2/libalsa09.
+endif
+
+###
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -90,7 +100,7 @@
 	dh_clean
 	dh_installdirs
 	cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install --list-missing
+	dh_install --list-missing $(DH_INSTALL_EXCLUDE)
 	touch $@ 
 
 #