[Pkg-sugar-commit] [sugar] 01/05: Update package relations: Have sugar-session recommend (not suggest) and sucrose depend on (not recommend) sugar-calculate-activity: No longer uses deprecated Glucose parts.

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/0.112-2
in repository sugar.

commit 49944ffb9898ab9e6aa24b8f835b604f50863cf8
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jan 8 11:51:37 2018 +0100

    Update package relations: Have sugar-session recommend (not suggest) and sucrose depend on (not recommend) sugar-calculate-activity: No longer uses deprecated Glucose parts.
---
 debian/rules | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index a5b415c..d8d10a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,14 +59,10 @@ fructose = chat browse read calculate log write terminal pippy etoys
 fructose += imageviewer jukebox turtleart
 # Core activities not in Debian main
 fructose-relax = etoys turtleart
-# Core activities using deprecated Glucose parts
-fructose-deprecate = calculate
 pkg-fructose = $(patsubst %,$(comma) sugar-%-activity,\
- $(filter-out $(fructose-relax) $(fructose-deprecate),$(fructose)))
+ $(filter-out $(fructose-relax),$(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)
@@ -129,14 +125,13 @@ suggests-fructose +=, gstreamer0.10-plugins-good
 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 and Fructose parts
+#  * Recommend deprecated Glucose parts
 #  * Re-suggest weak parts (contrib/non-free/missing)
 depends-sucrose = $(pkg-session)
 depends-sucrose +=, python-carquinyol
@@ -146,7 +141,6 @@ recommends-sucrose +=, $(suggests-activities)
 recommends-sucrose +=, python-sugar-toolkit
 recommends-sucrose +=, python-sugar
 recommends-sucrose +=, gtk2-engines-sugar (>= $(pkgbranch))
-recommends-sucrose +=, $(pkg-fructose-deprecated)
 suggests-sucrose = $(suggests-fructose), $(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