[Pkg-sugar-commit] [sugar-toolkit] 02/04: Append _DEFAULT to deprecated CDBS variables in rules file.

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/0.86.2-7
in repository sugar-toolkit.

commit 51dc5f11a0489210da4fedf8a5eb1eea56bdf741
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Oct 12 14:37:30 2010 +0200

    Append _DEFAULT to deprecated CDBS variables in rules file.
---
 debian/rules | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3161de4..b8bbc7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,15 +52,15 @@ CDBS_BUILD_DEPENDS += , libglib2.0-dev, python-gtk2-dev, libsm-dev, libice-dev,
 #    dropped after Squeeze+1
 #  * python-gobject versioning needed for GIO bindings
 #  * zip, git and subversion are used in .xo format packaging routines
-CDBS_DEPENDS = python-gtk2, python-dbus, python-gobject (>= 2.15.0), python-cairo, python-telepathy, python-cjson, python-sugar-$(pkgbranch), python-hippocanvas, python-gconf | python-gnome2 (<= 2.22.3-2)
-CDBS_DEPENDS += , python-rsvg | python-gnome2-desktop (<= 2.24.0-1), python-rsvg | librsvg2-common
-CDBS_RECOMMENDS = sugar-$(pkgbranch), python-carquinyol-$(pkgbranch), sugar-presence-service-$(pkgbranch), python-jarabe-$(pkgbranch), ttf-dejavu-core, unzip
-CDBS_SUGGESTS = git-core, subversion, ttf-dejavu-extra
+CDBS_DEPENDS_DEFAULT = python-gtk2, python-dbus, python-gobject (>= 2.15.0), python-cairo, python-telepathy, python-cjson, python-sugar-$(pkgbranch), python-hippocanvas, python-gconf | python-gnome2 (<= 2.22.3-2)
+CDBS_DEPENDS_DEFAULT += , python-rsvg | python-gnome2-desktop (<= 2.24.0-1), python-rsvg | librsvg2-common
+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
 
 # 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_DEFAULT = $(pkgbase)
+CDBS_CONFLICTS_DEFAULT = $(pkgbase)
+CDBS_REPLACES_DEFAULT = $(pkgbase)
 
 # Needed for our packaging
 CDBS_BUILD_DEPENDS += , chrpath

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