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

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Mar 10 13:54:02 UTC 2010


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

    Fix avoid package-relations.mk accidentally relying on debhelper.mk, and cover udebs too (if ever that becomes relevant).

diff --git a/debian/cdbs/1/rules/package-relations.mk b/debian/cdbs/1/rules/package-relations.mk
index 2cd2995..73a3361 100644
--- a/debian/cdbs/1/rules/package-relations.mk
+++ b/debian/cdbs/1/rules/package-relations.mk
@@ -31,7 +31,7 @@ cdbs_squash_commas = $(shell echo '$1' | sed -e 's/ *,[ ,]*/, /g' -e 's/^[ ,]*//
 cdbs_all_cur_squash_commas = $(call cdbs_squash_commas,$($(1)_ALL)$(comma) $(call cdbs_curvar,$1))
 
 # Apply CDBS-declared dependencies to binary packages
-$(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) :: binary-predeb/%:
+$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
 	@echo 'Adding cdbs dependencies to debian/$(cdbs_curpkg).substvars'
 	@echo 'cdbs:Depends=$(call cdbs_all_cur_squash_commas,CDBS_DEPENDS)' >> debian/$(cdbs_curpkg).substvars
 	@echo 'cdbs:Pre-Depends=$(call cdbs_all_cur_squash_commas,CDBS_PREDEPENDS)' >> debian/$(cdbs_curpkg).substvars

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list