[Pkg-sugar-commit] [sugar] 04/08: Update package relations: Fix avoid sucrose-* depend on non-Sucrose helper packages already recommended by other Sucrose packages (as intended in 0.104.1-5).

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository sugar.

commit 6315982dc4a93f110a44478e38197d3674869f60
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Apr 20 18:59:11 2015 +0200

    Update package relations: Fix avoid sucrose-* depend on non-Sucrose helper packages already recommended by other Sucrose packages (as intended in 0.104.1-5).
---
 debian/rules | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 39b30fb..051b154 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,7 @@ depends-jarabe +=, metacity
 recommends-session = lsb-release, network-manager, modemmanager, ethtool
 recommends-session +=, upower, gvfs, tzdata, fonts-dejavu-core, dbus-x11
 recommends-session +=, mobile-broadband-provider-info
-recommends-session-only = $(call session_expand_activities,true)
+recommends-session +=, $(call session_expand_activities,true)
 recommends-jarabe = python-carquinyol-$(pkgbranch)
 recommends-jarabe +=, dbus-x11, network-manager, modemmanager
 recommends-jarabe +=, avahi-autoipd, openssh-client, xdg-user-dirs
@@ -119,7 +119,7 @@ suggests-jarabe-only = $(pkg-session)
 #  * Recommend deprecated Glucose parts
 #  * Re-suggest weak parts (contrib/non-free/missing)
 depends-sucrose = $(pkg-session)
-depends-sucrose +=, $(recommends-jarabe), $(recommends-session)
+depends-sucrose +=, python-carquinyol-$(pkgbranch)
 depends-sucrose +=, $(call session_expand_activities)
 recommends-sucrose = $(suggests-session), $(suggests-toolkit)
 recommends-sucrose +=, python-sugar-toolkit-0.98 | python-sugar-toolkit
@@ -133,7 +133,6 @@ CDBS_DEPENDS_$(pkg-session) = $(depends-session)
 CDBS_DEPENDS_$(pkg-jarabe) = $(depends-jarabe)
 CDBS_DEPENDS_$(pkg-sucrose) = $(depends-sucrose)
 CDBS_RECOMMENDS_$(pkg-session) = $(recommends-session)
-CDBS_RECOMMENDS_$(pkg-session) +=, $(recommends-session-only)
 CDBS_RECOMMENDS_$(pkg-jarabe) = $(recommends-jarabe)
 CDBS_RECOMMENDS_$(pkg-sucrose) = $(recommends-sucrose)
 CDBS_SUGGESTS_$(pkg-session) = $(suggests-session)

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