[SCM] calf audio plugins packaging branch, master, updated. upstream/0.0.18.5-48-g0119489

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dacf89d5c39bcbd5c6afe479ca1874fba3536334
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jan 19 01:59:24 2010 +0100

    Fix and improve package-relations.mk stripping duplicate build-dependencies.

diff --git a/debian/cdbs/1/rules/package-relations.mk b/debian/cdbs/1/rules/package-relations.mk
index 76db9e5..8233f97 100644
--- a/debian/cdbs/1/rules/package-relations.mk
+++ b/debian/cdbs/1/rules/package-relations.mk
@@ -26,16 +26,21 @@ _cdbs_rules_package_relations = 1
 
 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 
+# workaround for shell function choking on parens in regex
+leftparens = (
+
 # Merge build-dependencies on same packages
 # TODO: rewrite (in perl, probably) to be more generic
 CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.53)/ s/\bcdbs *\(,\|(>= \(0.4.23-1.1\|0.4.27\|0.4.39\|0.4.43\))\)/, /g')
 CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\bcdbs *\(,\|(>= \(0.4.23-1.1\|0.4.27\|0.4.39\|0.4.43\))\)/cdbs, /g')
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\(\bcdbs,.*\), *cdbs *,/\1, /g')
 CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 7.0.1)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\|5.0.44\|6\))\)/, /g')
 CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 6)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\|5.0.44\))\)/, /g')
 CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5.0.44)/ s/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\))\)/, /g')
 CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\bdebhelper *\(,\|(>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\))\)/debhelper, /g')
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\(\bdebhelper,.*\), *debhelper *,/\1, /g')
+
+# Strip unversioned build-dependencies if repeated (versioned or not)
+# TODO: also strip unversioned build-dependency followed by versioned one
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | perl -pe 's/((?<=\A)|(?<=,)) *(\w+) *,(?=([^,]*,)*? *\2 *(\$(leftparens)|,|\Z))//g')
 
 # TODO: Move these to buildcore.mk
 cdbs_curvar = $(or $($(1)_$(cdbs_curpkg)),$($1))

-- 
calf audio plugins packaging