[SCM] ices2/master: Tighten build-dependency handling.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bd83c6679d4e58e87d48e5e47bd9c704670cb922
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jan 1 12:41:29 2011 +0100

    Tighten build-dependency handling.

diff --git a/debian/rules b/debian/rules
index af7c46d..c7e0d50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 CDBS_BUILD_DEPENDS_rules_upstream-tarball =
 CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
 
+# Upstream requirements
+#  Icecast is GPL so needs gnutls variant of CURL
+CDBS_BUILD_DEPENDS += , libogg-dev (>> 1.0.0), libvorbis-dev (>> 1.0.0), libshout3-dev (>> 2.0), libxml2-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], pkg-config
+
 DEB_UPSTREAM_PACKAGE = ices
 DEB_UPSTREAM_URL = http://downloads.us.xiph.org/releases/ices
 DEB_UPSTREAM_TARBALL_MD5 = 0d95ac34d59fed337028d5e7771076d8
@@ -43,10 +47,3 @@ DEB_COMPRESS_EXCLUDE = .xml
 # Debian places documentation below /usr/share/doc
 binary-post-install/ices2::
 	mv debian/ices2/usr/share/ices debian/ices2/usr/share/doc/ices2/html
-
-# Upstream requirements
-#  Icecast is GPL so needs gnutls variant of CURL
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libogg-dev (>> 1.0.0), libvorbis-dev (>> 1.0.0), libshout3-dev (>> 2.0), libxml2-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], pkg-config
-
-# Fix double cdbs build-dependencies
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')

-- 
ices2 packaging