[Pkg-sugar-commit] [sugar-artwork] 04/07: 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.0-7
in repository sugar-artwork.

commit 6d04c3123abcf6b3d4a48018e12a747a5327896c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Oct 12 13:49:56 2010 +0200

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

diff --git a/debian/rules b/debian/rules
index d0a8918..87f9c0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,13 +48,13 @@ binary-strip/$(pkg)::
 CDBS_BUILD_DEPENDS += , libgtk2.0-dev (>= 2.16), libglib2.0-dev, libcairo2-dev, python-empy, icon-slicer, icon-naming-utils (>= 0.8.2), x11-apps
 
 # Needed (always/often) at runtime
-CDBS_DEPENDS = ttf-dejavu-core
-CDBS_RECOMMENDS = sugar-$(pkgbranch), ttf-dejavu-extra
+CDBS_DEPENDS_DEFAULT = ttf-dejavu-core
+CDBS_RECOMMENDS_DEFAULT = sugar-$(pkgbranch), 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-artwork.git