[Pkg-sugar-commit] [sugar-toolkit] 11/21: Tidy rules file: Tighten package-specific CDBS variables and targets.

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/0.88.1-4
in repository sugar-toolkit.

commit 6c8c34fab9b37a84b6ac472acbcf432a7e556021
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 30 19:13:33 2013 +0200

    Tidy rules file: Tighten package-specific CDBS variables and targets.
---
 debian/rules | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index b8eaa85..8281ab1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,19 +44,29 @@ binary-strip/$(pkg)::
 	find $(DEB_DESTDIR)/usr/lib -type f -name '*.so' -exec chrpath -d '{}' ';'
 
 # Needed by upstream build process
-CDBS_BUILD_DEPENDS += , libglib2.0-dev, python-gtk2-dev, libsm-dev, libice-dev, libasound2-dev | libasound-dev, gettext, intltool, libxml-parser-perl
+bdeps = libglib2.0-dev, python-gtk2-dev, libsm-dev, libice-dev
+bdeps +=, libasound2-dev | libasound-dev, gettext, intltool
+bdeps +=, libxml-parser-perl
+
+# Needed for our packaging
+bdeps +=, chrpath
 
 # Needed (always/often/seldom) at runtime
 #  * zip, git and subversion are used in .xo format packaging routines
-CDBS_DEPENDS_DEFAULT = python-gtk2, python-dbus, python-gobject, python-cairo, python-telepathy, python-cjson, python-sugar-$(pkgbranch), python-hippocanvas, python-gconf, python-dateutil
-CDBS_DEPENDS_DEFAULT += , python-rsvg
-CDBS_RECOMMENDS_DEFAULT = sugar-$(pkgbranch), python-carquinyol-$(pkgbranch), sugar-presence-service-$(pkgbranch), python-jarabe-$(pkgbranch), ttf-dejavu-core, unzip
-CDBS_SUGGESTS_DEFAULT = git-core, subversion, ttf-dejavu-extra
+python-depends = gtk2 dbus gobject cairo telepathy cjson
+python-depends += sugar-$(pkgbranch) hippocanvas gconf dateutil rsvg
+depends = $(patsubst %,$(comma) python-%,$(python-depends))
+recommends = sugar-$(pkgbranch), python-carquinyol-$(pkgbranch)
+recommends +=, sugar-presence-service-$(pkgbranch)
+recommends +=, python-jarabe-$(pkgbranch), ttf-dejavu-core, unzip
+suggests = git-core, subversion, ttf-dejavu-extra
 
-# Ensure only one variant is installed at a time (Debian Policy 7.6.2)
-CDBS_PROVIDES_DEFAULT = $(pkgbase)
-CDBS_CONFLICTS_DEFAULT = $(pkgbase)
-CDBS_REPLACES_DEFAULT = $(pkgbase)
+CDBS_BUILD_DEPENDS +=, $(bdeps)
+CDBS_DEPENDS_$(pkg) = $(depends)
+CDBS_RECOMMENDS_$(pkg) = $(recommends)
+CDBS_SUGGESTS_$(pkg) = $(suggests)
 
-# Needed for our packaging
-CDBS_BUILD_DEPENDS += , chrpath
+# Ensure only one variant is installed at a time (Debian Policy 7.6.2)
+CDBS_PROVIDES_$(pkg) = $(pkgbase)
+CDBS_CONFLICTS_$(pkg) = $(pkgbase)
+CDBS_REPLACES_$(pkg) = $(pkgbase)

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