[Pkg-sugar-commit] [sugar-browse-activity] 14/32: Fix include branched activities in python-sugar.mk.

Jonas Smedegaard dr at jones.dk
Mon Apr 20 09:46:44 UTC 2015


This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/108-10
in repository sugar-browse-activity.

commit c9349fa07cc95f984c9a1d2750cba4efc732461c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Sep 18 20:37:54 2009 +0200

    Fix include branched activities in python-sugar.mk.
---
 debian/cdbs/1/class/python-sugar.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/cdbs/1/class/python-sugar.mk b/debian/cdbs/1/class/python-sugar.mk
index 6709da5..5a3f4ed 100644
--- a/debian/cdbs/1/class/python-sugar.mk
+++ b/debian/cdbs/1/class/python-sugar.mk
@@ -67,7 +67,7 @@ endif
 # Convenience variable for e.g. conflicts/provides/replaces
 DEB_SUGAR_SOURCE_PKGBASE ?= $(DEB_SOURCE_PACKAGE:%-$(firstword $(DEB_SUGAR_BRANCHES))=%)
 
-DEB_PYTHON_SUGAR_PACKAGES = $(filter sugar-%-activity, $(DEB_PACKAGES))
+DEB_PYTHON_SUGAR_PACKAGES ?= $(filter $(call cdbs_expand_branches,sugar-%-activity,$(DEB_SUGAR_BRANCHES)), $(DEB_PACKAGES))
 
 # TODO: Move this to buildvars.mk
 cdbs_pkgsrcdir = $(if $(DEB_PKGSRCDIR_$(cdbs_curpkg)),$(DEB_PKGSRCDIR_$(cdbs_curpkg)),$(DEB_SRCDIR))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-browse-activity.git



More information about the pkg-sugar-commit mailing list