[SCM] lash packaging branch, master, updated. debian/0.5.4.0-1-2-gacc737e

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit acc737e21c37125d1aea8be8d461e1fc5e58772c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat May 15 11:03:07 2010 +0200

    Avoid ALSA on non-linux archs.

diff --git a/debian/control.in b/debian/control.in
index b192268..1b8a001 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,7 +7,7 @@ Uploaders: Jaromír Mikeš <mira.mikes at seznam.cz>,
  Jonas Smedegaard <dr at jones.dk>
 Build-Depends: @cdbs@,
  libjack-dev,
- libasound2-dev,
+ libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
  libreadline-dev,
  uuid-dev,
  libgtk2.0-dev,
diff --git a/debian/rules b/debian/rules
index 5df7f91..8033ca0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^\./(icons/.*\.png|debian/(changelog|copyrigh
 
 LDFLAGS += -luuid
 
+DEB_CONFIGURE_EXTRA_FLAGS = $(if $(filter linux,$(DEB_HOST_ARCH_OS)),,--disable-alsa-midi)
+
 # put aside upstream-shipped temp files during build but after copyright-check
 upstreamtmpfiles = docs/lash-manual-html-one-page/lash-manual.html
 pre-build:: debian/stamp-upstreamtmpstuff

-- 
lash packaging