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

js at users.alioth.debian.org js at users.alioth.debian.org
Tue Mar 2 16:23:32 UTC 2010


The following commit has been merged in the master branch:
commit 127c00624d0ca91c2080ff5a8b96fdd3c92180f9
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Mar 2 05:03:38 2010 +0100

    Handle cdbs 0.4.67~ in package-relations.mk.

diff --git a/debian/cdbs/1/rules/package-relations.mk b/debian/cdbs/1/rules/package-relations.mk
index 7574b50..3f43609 100644
--- a/debian/cdbs/1/rules/package-relations.mk
+++ b/debian/cdbs/1/rules/package-relations.mk
@@ -29,6 +29,7 @@ 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')

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list