Package:cdbs Version: 0.4.85 Building in an amd64 lenny chroot is failing test debhelper-6.sh
Running that test directly (to get verbose output) ends with: dh_strip -pcdbs-testsuite-data --dbg-package= Option dbg-package requires an argument dh_strip: unknown option; aborting make: *** [binary-strip-IMPL/cdbs-testsuite-data] Error 1 It looks like commit a51833f8193dc80e992041307705e770283b76b8 is the cause, and can be fixed with: >From 1c8671b1a9cefc4f8556165f55a9b55fb84de950 Mon Sep 17 00:00:00 2001 From: Kris Shannon <k...@shannon.id.au> Date: Thu, 29 Jul 2010 21:00:39 +1000 Subject: [PATCH] Strip DEB_DBG_PACKAGE expansion to avoid empty --dbg-package argument to dh_strip --- 1/rules/debhelper.mk.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/1/rules/debhelper.mk.in b/1/rules/debhelper.mk.in index efe3fe92afb0565f18a94e4c28d91b4660b15800..656db1272af652730b48624de9134aeb653c9589 100644 --- a/1/rules/debhelper.mk.in +++ b/1/rules/debhelper.mk.in @@ -140,7 +140,7 @@ endef $(foreach x,$(DEB_DBG_PACKAGES),$(eval $(call cdbs_deb_dbg_package_assign,$(value x)))) endif endif -cdbs_dbg_package = $(call cdbs_expand_curvar,DEB_DBG_PACKAGE) +cdbs_dbg_package = $(strip $(call cdbs_expand_curvar,DEB_DBG_PACKAGE)) cdbs_dbg_package_option = $(if $(cdbs_dbg_package),$(shell if [ "$(DH_COMPAT)" -ge 5 ]; then echo "--dbg-package=$(strip $(cdbs_dbg_package))"; fi)) DEB_DH_STRIP_ARGS ?= $(cdbs_dbg_package_option) endif -- 1.7.0 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
