[Pkg-sugar-commit] [sugar] 10/10: Prepare for release: Update changelog and copyright hints.

[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 a484237aca40f7822943ddcf39cc94cfa1287bad
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Sep 14 16:42:13 2015 +0200

    Prepare for release: Update changelog and copyright hints.
---
 debian/changelog       | 12 ++++++++++++
 debian/copyright_hints | 12 ++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23805c6..4dcdfa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+sugar (0.106.1-1) unstable; urgency=medium
+
+  [ upstream ]
+  * New release.
+
+  [ Jonas Smedegaard ]
+  * Update licensing info:
+    + Merge pseudo-derived licenses (Use License-Grant to indicate
+      difference in verbatim text).
+
+ -- Jonas Smedegaard <dr at jones.dk>  Mon, 14 Sep 2015 16:41:49 +0200
+
 sugar (0.106.0-2) unstable; urgency=medium
 
   * Recommend/depend on (not suggest/recommend) Read activity: Available
diff --git a/debian/copyright_hints b/debian/copyright_hints
index f032c4a..6fc28a8 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -357,7 +357,7 @@ Files: src/jarabe/desktop/friendview.py
  src/jarabe/view/buddymenu.py
  src/jarabe/view/service.py
 Copyright: 2006-2007, Red Hat, Inc
-  2010, Collabora Ltd. <http://www.collabora.co.uk/>
+  2010, Collabora Ltd. <http:www.collabora.co.uk/>
 License: GPL-2+
  FIXME
 
@@ -437,7 +437,7 @@ License: GPL-2+
 
 Files: src/jarabe/model/neighborhood.py
  src/jarabe/model/telepathyclient.py
-Copyright: 2010, Collabora Ltd. <http://www.collabora.co.uk/>
+Copyright: 2010, Collabora Ltd. <http:www.collabora.co.uk/>
 License: GPL-2+
  FIXME
 
@@ -593,7 +593,7 @@ Copyright: 2006-2007, Red Hat, Inc
   2008-2013, Sugar Labs
   2009, Tomeu Vizoso, Simon Schampijer
   2009-2012, One Laptop per Child
-  2010, Collabora Ltd. <http://www.collabora.co.uk/>
+  2010, Collabora Ltd. <http:www.collabora.co.uk/>
   2013, Daniel Francis
   2013, Walter Bender
 License: GPL-2+
@@ -602,7 +602,7 @@ License: GPL-2+
 Files: src/jarabe/frame/activitiestray.py
 Copyright: 2006-2007, Red Hat, Inc
   2008, One Laptop Per Child
-  2010, Collabora Ltd. <http://www.collabora.co.uk/>
+  2010, Collabora Ltd. <http:www.collabora.co.uk/>
 License: GPL-2+
  FIXME
 
@@ -610,7 +610,7 @@ Files: src/jarabe/desktop/meshbox.py
 Copyright: 2006-2007, Red Hat, Inc
   2009, Tomeu Vizoso, Simon Schampijer
   2009-2010, One Laptop per Child
-  2010, Collabora Ltd. <http://www.collabora.co.uk/>
+  2010, Collabora Ltd. <http:www.collabora.co.uk/>
 License: GPL-2+
  FIXME
 
@@ -858,7 +858,7 @@ License: LGPL-2+
  FIXME
 
 Files: src/jarabe/util/telepathy/connection_watcher.py
-Copyright: 2008, Collabora Ltd. <http://www.collabora.co.uk/>
+Copyright: 2008, Collabora Ltd. <http:www.collabora.co.uk/>
 License: LGPL-2.1+
  FIXME
 

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