[Pkg-sugar-commit] [sugar] 02/03: Sync with master-0.104: Un-relax imageviewer as Fructose activity. Merge changelog entries.

[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 45a5523478c50a371d7971d25a3ab3588a2767f3
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jun 26 12:25:20 2015 -0500

    Sync with master-0.104: Un-relax imageviewer as Fructose activity. Merge changelog entries.
---
 debian/changelog | 33 +++++++++++++++++++++++++++------
 debian/rules     |  2 +-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14d0afd..4efddcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
+sugar (0.105.2-3) UNRELEASED; urgency=medium
+
+  (0.104.1-13 changes partly re-applied)
+
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 26 Jun 2015 12:23:04 -0500
+
 sugar (0.105.2-2) experimental; urgency=medium
 
-  * Update package relations:
-    + Have sugar-session provide virtual x-session-manager.
-    + Have python-jarabe provide virtual notification-daemon.
+  (0.104.1-12 changes re-applied)
 
  -- Jonas Smedegaard <dr at jones.dk>  Wed, 17 Jun 2015 13:16:06 -0500
 
@@ -12,19 +16,36 @@ sugar (0.105.2-1) experimental; urgency=medium
   * New release(s).
 
   [ Jonas Smedegaard ]
-  * Drop branch from source and binary package.
   * Update package relations:
-    + Recommend/depend on unbranched but at least current branch of
-      Glucose parts (i.e. core libraries).
     + Stop have sugar-session depend on gir1.2-networkmanager-1.0: No
       longer needed.
     + Have python-jarabe depend on policykit-1: Needed for new
       brightness helper tools.
   * Update copyright info:
     + Extend coverage for main upstream authors.
+  (0.104.1-13 changes partly re-applied)
 
  -- Jonas Smedegaard <dr at jones.dk>  Tue, 16 Jun 2015 15:16:45 -0500
 
+sugar (0.104.1-13) unstable; urgency=medium
+
+  * Drop branch from source and binary package.
+  * Update package relations:
+    + Recommend/depend on Glucose parts (i.e. core libraries) unbranched
+      but at least current branch.
+    + Suggest/recommend/depend on Fructose (i.e. core activities)
+      unbranched.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 26 Jun 2015 10:51:25 -0500
+
+sugar-0.104 (0.104.1-12) unstable; urgency=medium
+
+  * Update package relations:
+    + Have sugar-session provide virtual x-session-manager.
+    + Have python-jarabe provide virtual notification-daemon.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Wed, 17 Jun 2015 18:44:10 -0500
+
 sugar-0.104 (0.104.1-11) unstable; urgency=medium
 
   * Adapt packaging in maintainer mode when targeting experimental:
diff --git a/debian/rules b/debian/rules
index f0a39af..aaa5377 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,7 @@ bdeps +=, python-empy
 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 imageviewer
+fructose-relax = read etoys turtleart
 pkg-fructose = $(patsubst %,$(comma) sugar-%-activity,$(filter-out $(fructose-relax),$(fructose)))
 pkg-fructose-relaxed = $(patsubst %,$(comma) sugar-%-activity,$(fructose-relax))
 

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