[Pkg-sugar-commit] [sugar-chat-activity] 03/05: Use new python-sugar.mk variables DEB_SUGAR_BRANCHES and DEB_SUGAR_SOURCE_PKGBASE, and expansion cdbs_sugar_anybranchdeps.

[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 57454246b7189421f196ca1f3855e3d817283d6e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Sep 19 11:54:15 2009 +0200

    Use new python-sugar.mk variables DEB_SUGAR_BRANCHES and DEB_SUGAR_SOURCE_PKGBASE, and expansion cdbs_sugar_anybranchdeps.
---
 debian/rules | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 02f660a..3cabe40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@
 # 02111-1307 USA.
 
 DEB_PYTHON_SYSTEM = pycentral
+DEB_SUGAR_BRANCHES = 0.84
 ifneq (,$(DEB_MAINTAINER_MODE))
   # Enable stuff not policy compliant (eg. unsuitable for build daemons)
   DEB_COPYRIGHT_CHECK_STRICT = yes
@@ -30,9 +31,6 @@ include debian/cdbs/1/rules/copyright-check.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/1/rules/buildinfo.mk
 
-# Comment out when all current branches are supported
-# FIXME: really make this plural - only a single branch handled for now
-pkgbranches = 0.84
 pkgbase = $(DEB_SOURCE_PACKAGE:%-$(firstword $(pkgbranches))=%)
 
 DEB_UPSTREAM_PACKAGE = Chat
@@ -41,14 +39,14 @@ DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
 DEB_UPSTREAM_TARBALL_MD5 = 8926e848ff40e178a47de49ac6049b1f
 
 # Needed (always/often) at runtime
-CDBS_DEPENDS = python-sugar$(pkgbranches:%=-%), python-sugar-toolkit$(pkgbranches:%=-%)
+CDBS_DEPENDS = $(call cdbs_sugar_anybranchdeps,python-sugar python-sugar-toolkit)
 CDBS_DEPENDS += , python-hippocanvas, python-telepathy, python-gtk2, python-cjson
-CDBS_RECOMMENDS = sugar$(pkgbranches:%=-%)
+CDBS_RECOMMENDS = $(call cdbs_sugar_anybranchdeps,sugar)
 
 # Ensure only one variant is installed at a time (Debian Policy 7.6.2)
-CDBS_PROVIDES = $(pkgbase)
-CDBS_CONFLICTS = $(pkgbase)
-CDBS_REPLACES = $(pkgbase)
+CDBS_PROVIDES = $(DEB_SUGAR_SOURCE_PKGBASE)
+CDBS_CONFLICTS = $(DEB_SUGAR_SOURCE_PKGBASE)
+CDBS_REPLACES = $(DEB_SUGAR_SOURCE_PKGBASE)
 
 # Resolve, cleanup and apply CDBS-declared dependencies
 include debian/cdbs/1/rules/package-relations.mk

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