[Pkg-sugar-commit] [sugar] 01/10: Update package relations: Relax to suggest/recommend (not recommend/depend on) Calculate activity: Uses deprecated Glucose parts.

[Jonas Smedegaard]

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

js pushed a commit to branch master-0.104
in repository sugar.

commit 9f4c9535f289b773157591c76a2ac6227d2f6acf
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 28 19:37:52 2015 -0500

    Update package relations: Relax to suggest/recommend (not recommend/depend on) Calculate activity: Uses deprecated Glucose parts.
---
 debian/rules | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 980d1c7..3e4c8ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,8 +68,11 @@ fructose = chat browse read calculate log write terminal pippy etoys
 fructose += imageviewer jukebox turtleart
 # Core activities not in Debian main
 fructose-relax = read etoys turtleart
-pkg-fructose = $(patsubst %,$(comma) sugar-%-activity,$(filter-out $(fructose-relax),$(fructose)))
+# Core activities using deprecated Glucose parts
+fructose-deprecate = calculate
+pkg-fructose = $(patsubst %,$(comma) sugar-%-activity,$(filter-out $(fructose-relax) $(fructose-deprecate),$(fructose)))
 pkg-fructose-relaxed = $(patsubst %,$(comma) sugar-%-activity,$(fructose-relax))
+pkg-fructose-deprecated = $(patsubst %,$(comma) sugar-%-activity,$(fructose-deprecate))
 
 # Needed (always/often/sometimes) at runtime
 #  * Glucose (at least current branch)
@@ -122,13 +125,14 @@ suggests-toolkit = git, ipython
 suggests-session-weak = gir1.2-maliit-1.0, maliit-keyboard
 suggests-session-only = $(suggests-session-weak), $(pkg-sucrose)
 suggests-session-only +=, $(pkg-fructose-relaxed)
+suggests-session-only +=, $(pkg-fructose-deprecated)
 suggests-jarabe-only = $(pkg-session)
 
 # Tighten relations in Sucrose metapackage:
 #  * Depend on Glucose (at least current branch)
 #  * Depend on Fructose
 #  * Recommend non-Sugar helper parts
-#  * Recommend deprecated Glucose parts
+#  * Recommend deprecated Glucose and Fructose parts
 #  * Re-suggest weak parts (contrib/non-free/missing)
 depends-sucrose = $(pkg-session)
 depends-sucrose +=, python-carquinyol (>= $(pkgbranch))
@@ -137,6 +141,7 @@ recommends-sucrose = $(suggests-session), $(suggests-toolkit)
 recommends-sucrose +=, python-sugar-toolkit
 recommends-sucrose +=, python-sugar
 recommends-sucrose +=, gtk2-engines-sugar (>= $(pkgbranch))
+recommends-sucrose +=, $(pkg-fructose-deprecated)
 suggests-sucrose = $(suggests-session-weak)
 suggests-sucrose +=, $(pkg-fructose-relaxed)
 

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