[SCM] morituri/master: Avoid deprecated unqualified CDBS variables CDBS_DEPENDS, CDBS_RECOMMENDS and CDBS_SUGGESTS.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6e5ad1a841736e9f3547381d994d58098b06ce69
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Feb 14 19:04:10 2012 +0100

    Avoid deprecated unqualified CDBS variables CDBS_DEPENDS, CDBS_RECOMMENDS and CDBS_SUGGESTS.

diff --git a/debian/rules b/debian/rules
index 6562f18..2c624de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ CDBS_BUILD_DEPENDS += , python-epydoc, pychecker, python-twisted-core
 # Needed both to build and at runtime
 #  * gstreamer0.10-plugins-good due to profiles flac, wav, wavpack and vorbis
 common-depends = python-gst0.10, python-gobject, python-gst0.10, gstreamer0.10-plugins-good (>= 0.10.22)
-CDBS_DEPENDS = $(common-depends)
+CDBS_DEPENDS_DEFAULT = $(common-depends)
 CDBS_BUILD_DEPENDS += , $(common-depends)
 
 # Needed (always/often/sometimes) at runtime
@@ -48,6 +48,6 @@ CDBS_BUILD_DEPENDS += , $(common-depends)
 #  * gstreamer0.10-lame due to profiles mp3 and mp3vbr
 # TODO: recommend (not suggest) python-pycdio when packaged
 # python-gtk2 needed only in apparently unused common/taskgtk
-CDBS_DEPENDS += , python, python-musicbrainz2, python-pkg-resources, cdparanoia, cdrdao, python-cddb
-CDBS_RECOMMENDS = gstreamer0.10-ffmpeg
-CDBS_SUGGESTS += , gstreamer0.10-lame, python-pycdio, python-gtk2
+CDBS_DEPENDS_DEFAULT += , python, python-musicbrainz2, python-pkg-resources, cdparanoia, cdrdao, python-cddb
+CDBS_RECOMMENDS_DEFAULT = gstreamer0.10-ffmpeg
+CDBS_SUGGESTS_DEFAULT += , gstreamer0.10-lame, python-pycdio, python-gtk2

-- 
morituri packaging