[Pkg-sugar-commit] [sugar-chat-activity] 02/05: Update CDBS snippets: Fix copyright years. Fix use underscore (not dash) for internal variables. Build-depend unversioned on python-sugar-toolkit. Add new variable DEB_SUGAR_BRANCHES in python-sugar.mk.

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/65-3
in repository sugar-chat-activity.

commit 0122f7b9b79c7691b95deebfc663e729a86ab9cd
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Sep 19 11:49:22 2009 +0200

    Update CDBS snippets: Fix copyright years. Fix use underscore (not dash) for internal variables. Build-depend unversioned on python-sugar-toolkit. Add new variable DEB_SUGAR_BRANCHES in python-sugar.mk.
---
 debian/cdbs/1/class/python-sugar.mk | 28 ++++++++++++++++++++++++----
 debian/cdbs/1/class/python-vars.mk  |  3 +--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/debian/cdbs/1/class/python-sugar.mk b/debian/cdbs/1/class/python-sugar.mk
index 166db9e..5a3f4ed 100644
--- a/debian/cdbs/1/class/python-sugar.mk
+++ b/debian/cdbs/1/class/python-sugar.mk
@@ -29,8 +29,25 @@ _cdbs_class_python_sugar = 1
 include debian/cdbs/1/class/python-vars.mk
 include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix)
 
+# Space-delimited list of supported branches, lowest listed first
+# (comment out if all current branches are supported)
+# NB! This variable must be declared *above* inclusion of this snippet
+#DEB_SUGAR_BRANCHES = 0.84 0.86
+
+# FIXME: move these to buildvars.mk
+comma = ,
+cdbs_delimit = $(firstword $1)$(foreach word,$(wordlist 2,$(words $1),$1),$2$(word))
+
+# List "packages multiplied with branches", or just packages if no branches
+# FIXME: move this to buildvars.mk
+cdbs_expand_branches = $(subst WORDDELIMITER,$3,$(subst BRANCHDELIMITER,$4,$(call cdbs_delimit,$(if $2,$(foreach pkg,$1,$(call cdbs_delimit,$(foreach branch,$2,$(pkg)$(branch:%=-%)),BRANCHDELIMITER)),$1),WORDDELIMITER)))
+
+# convenience wrappers to expand Sugar branches for package dependencies
+cdbs_sugar_allbranchdeps = $(call cdbs_expand_branches,$1,$(DEB_SUGAR_BRANCHES),$(comma) ,$(comma) )
+cdbs_sugar_anybranchdeps = $(call cdbs_expand_branches,$1,$(DEB_SUGAR_BRANCHES),$(comma) , | )
+
 # Declare Build-Deps for packages using this file
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-sugar, python-sugar-toolkit (>= 0.82.5), unzip
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), $(call cdbs_sugar_anybranchdeps,python-sugar python-sugar-toolkit), unzip
 # FIXME: Resolve DEB_PYTHON_PACKAGES in build targets only
 ifeq (,$(cdbs_python_pkg_check)$(DEB_PYTHON_ARCH_PACKAGES))
   ifneq (, $(cdbs_python_compile_version))
@@ -47,7 +64,10 @@ else
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.5.6)
 endif
 
-DEB_PYTHON_SUGAR_PACKAGES = $(filter sugar-%-activity, $(DEB_PACKAGES))
+# Convenience variable for e.g. conflicts/provides/replaces
+DEB_SUGAR_SOURCE_PKGBASE ?= $(DEB_SOURCE_PACKAGE:%-$(firstword $(DEB_SUGAR_BRANCHES))=%)
+
+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))
@@ -57,11 +77,11 @@ pre-build::
 
 $(patsubst %,build/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: build/%:
 	[ ! -e $(cdbs_pkgsrcdir)/MANIFEST ] || [ -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || mv $(cdbs_pkgsrcdir)/MANIFEST $(cdbs_pkgsrcdir)/MANIFEST.upstream
-	egrep -v '^locale/.*/(.*\.mo|activity\.linfo)$$' $(cdbs_pkgsrcdir)/MANIFEST.upstream > $(cdbs_pkgsrcdir)/MANIFEST
+	[ ! -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || egrep -v '^locale/.*/(.*\.mo|activity\.linfo)$$' $(cdbs_pkgsrcdir)/MANIFEST.upstream > $(cdbs_pkgsrcdir)/MANIFEST
 	for pythonver in $(cdbs_python_build_versions); do \
 		/usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py build; \
 	done
-	-IFS="`printf '\n'`" find "$(cdbs_pkgsrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \
+	[ ! -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || IFS="`printf '\n'`" find "$(cdbs_pkgsrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \
 		echo "$$path" | sed 's!^$(cdbs_pkgsrcdir)/!!' >> $(cdbs_pkgsrcdir)/MANIFEST; \
 	done
 
diff --git a/debian/cdbs/1/class/python-vars.mk b/debian/cdbs/1/class/python-vars.mk
index 3f78176..729a3c2 100644
--- a/debian/cdbs/1/class/python-vars.mk
+++ b/debian/cdbs/1/class/python-vars.mk
@@ -1,6 +1,5 @@
 # -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2008 Jonas Smedegaard <dr at jones.dk>
-# Copyright © 2008 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2003,2008 Jonas Smedegaard <dr at jones.dk>
 # Description: Defines useful variables for Python packages
 #
 # This program is free software; you can redistribute it and/or

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