[SCM] libshout/master: Modernize CDBS: Declare build-dependencies recursively expanded (using = not := ). Stop build-dependency tidying (done upstream now).

js at users.alioth.debian.org js at users.alioth.debian.org
Thu Dec 8 02:41:06 UTC 2011


The following commit has been merged in the master branch:
commit c0474ae3272cab2a4f5d86c3989c5207f3944699
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Dec 6 18:36:41 2011 +0700

    Modernize CDBS: Declare build-dependencies recursively expanded (using = not := ). Stop build-dependency tidying (done upstream now).

diff --git a/debian/rules b/debian/rules
index 1c1880c..4c06562 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,10 +32,7 @@ clean::
 
 
 # Upstream requirements
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libogg-dev (>> 1.0.0), libvorbis-dev (>> 1.0.0), pkg-config, libtheora-dev (>> 0.0.0.alpha4), libspeex-dev
+CDBS_BUILD_DEPENDS += , libogg-dev (>> 1.0.0), libvorbis-dev (>> 1.0.0), pkg-config, libtheora-dev (>> 0.0.0.alpha4), libspeex-dev
 
 # Packaging requirements
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), d-shlibs (>= 0.48)
-
-# 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\|0.4.27\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
+CDBS_BUILD_DEPENDS += , d-shlibs (>= 0.48)

-- 
libshout packaging



More information about the pkg-multimedia-commits mailing list