[SCM] hydrogen packaging branch, master, updated. 1f8e4361335aef5d223885927c688d654b9566e2

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e4c72d133e074bd0ef2410f93df8fb9b4771e42d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Mar 1 21:41:15 2010 +0100

    Improve package-relationships.mk to strip unversioned build-dependency following same versioned.

diff --git a/debian/cdbs/1/rules/package-relations.mk b/debian/cdbs/1/rules/package-relations.mk
index 8233f97..efbba6d 100644
--- a/debian/cdbs/1/rules/package-relations.mk
+++ b/debian/cdbs/1/rules/package-relations.mk
@@ -38,10 +38,12 @@ CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelpe
 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')
 
-# Strip unversioned build-dependencies if repeated (versioned or not)
-# TODO: also strip unversioned build-dependency followed by versioned one
+# Strip unversioned build-dependency followed by same, versioned or not
 CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | perl -pe 's/((?<=\A)|(?<=,)) *(\w+) *,(?=([^,]*,)*? *\2 *(\$(leftparens)|,|\Z))//g')
 
+# Strip unversioned build-dependency following same versioned
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | perl -pe 's/((?<=\A)|(?<=,))( *(\w+) +\$(leftparens)[^,]+,)(([^,]*,)*?) *\3 *((?=,)|(?=\Z))/\2\4/g')
+
 # TODO: Move these to buildcore.mk
 cdbs_curvar = $(or $($(1)_$(cdbs_curpkg)),$($1))
 cdbs_squash_commas = $(shell echo '$1' | sed -e 's/ *,[ ,]*/, /g' -e 's/^[ ,]*//' -e 's/[ ,]*$$//')

-- 
hydrogen packaging