[SCM] hydrogen packaging branch, master, updated. 0e5b279b27fcef251c185d059977342af18424f9

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d8103b9a0a14b95e8ea50a5497f627a3513c77a1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Mar 8 18:02:04 2010 +0100

    Shrink local package-relations.mk to only handle binary relations: Build-dependency improvements in buildcore.mk since cdbs 0.6.70.

diff --git a/debian/cdbs/1/rules/package-relations.mk b/debian/cdbs/1/rules/package-relations.mk
index 3f43609..2cd2995 100644
--- a/debian/cdbs/1/rules/package-relations.mk
+++ b/debian/cdbs/1/rules/package-relations.mk
@@ -1,6 +1,6 @@
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright © 2008-2010 Jonas Smedegaard <dr at jones.dk>
-# Description: Resolve, cleanup and apply package relationships
+# Description: Resolve and apply binary package relationships
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -24,33 +24,10 @@ _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.67~)/ s/\bcdbs *\(,\|(>= \(0.4.23-1.1\|0.4.27\|0.4.39\|0.4.43\|0.4.53\))\)/, /g')
-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 '/\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')
-
-# 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/[ ,]*$$//')
 
-# Cleanup superfluous commas and whitespace
-CDBS_BUILD_DEPENDS := $(call cdbs_squash_commas,$(CDBS_BUILD_DEPENDS))
-
-comma = ,
 cdbs_all_cur_squash_commas = $(call cdbs_squash_commas,$($(1)_ALL)$(comma) $(call cdbs_curvar,$1))
 
 # Apply CDBS-declared dependencies to binary packages

-- 
hydrogen packaging