[SCM] gmerlin/master: Revert "Re-enable libasound2-dev on kfreebsd-*, hurd-i386 architectures since it is provided by 'liboss-salsa-dev'."

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit eda063afa0898a2b4beaa08406ca9b8e41333a01
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 17 17:23:58 2011 +0100

    Revert "Re-enable libasound2-dev on kfreebsd-*, hurd-i386 architectures since it is provided by 'liboss-salsa-dev'."
    
    This reverts commit ea59ef8c05409283b9edffbd3c3fcf4abf6a04cc.
    No luck on kfreebsd architectures, try to make it build successfully again.
    
    Conflicts:
    
    	debian/control.in

diff --git a/debian/control.in b/debian/control.in
index 2bbc623..c4d4e8b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -17,8 +17,8 @@ Build-Depends: @cdbs@,
  libcddb2-dev,
  libfreetype6-dev,
  libglu1-mesa-dev,
- libesd0-dev,
- libasound2-dev,
+ libesd0-dev, 
+ libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libxv-dev,
  libmusicbrainz4-dev,
  libpulse-dev,

-- 
gmerlin packaging