-# Fix http://bugs.debian.org/576967 : CDBS 0.4.77 in squeeze
-# incorrectly splits multiword $(CC) and $(CXX).
-override cdbs_set_nondefaultvars = $(foreach var,$1,$(if $(filter-out $(origin $(var)),default),$(var)='$($(var))'))
+# dh_buildinfo fails at multiarch: http://bugs.debian.org/620104
+CDBS_BUILD_DEPENDS_rules_debhelper_buildinfo =