[Pkg-sugar-commit] [sugar-toolkit-gtk3] 06/06: 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-toolkit-gtk3.

commit 99b25ccd765c8fefaaa345c515234d27e051b69d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Sep 14 15:47:55 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 45c9328..4a65228 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+sugar-toolkit-gtk3 (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 15:47:37 +0200
+
 sugar-toolkit-gtk3 (0.106.0-1) unstable; urgency=medium
 
   [ upstream ]
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 32c9478..b15af40 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -277,7 +277,7 @@ Files: src/sugar3/activity/activityfactory.py
  src/sugar3/presence/presenceservice.py
 Copyright: 2006-2007, Red Hat, Inc
   2007, Red Hat, Inc
-  2010, Collabora Ltd. <http://www.collabora.co.uk/>
+  2010, Collabora Ltd. <http:www.collabora.co.uk/>
 License: LGPL-2+
  FIXME
 
@@ -379,28 +379,23 @@ Copyright: 1994, X Consortium
 License: Expat
  FIXME
 
-Files: ltmain.sh
-Copyright: 1996-2001, 2003-2006
-License: GPL-2+
- FIXME
-
 Files: configure
 Copyright: (ISLOWER ? 'A' + ( - 'a') : )
   (ISLOWER ? ( | 0x40) : )
   1992-1996, 1998-2012, Free Software Foundation, Inc
-  1996-2001, 2003-2005,
+  1996-2001, 2003-2005, 2006-2011, Free Software
   2012, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
-Files: m4/libtool.m4
-Copyright: 1996-2001, 2003-2005
-  2011, Free Software Foundation, Inc
+Files: m4/intltool.m4
+Copyright: 2001, Eazel, Inc
 License: GPL-2+
  FIXME
 
-Files: m4/intltool.m4
-Copyright: 2001, Eazel, Inc
+Files: m4/libtool.m4
+Copyright: 1996-2001, 2003-2005, 2006-2011, Free Software
+  2011, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
@@ -422,6 +417,11 @@ Copyright: 1995-2002, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2006, 2007-2011, Free Software Foundation, Inc.
+License: GPL-2+
+ FIXME
+
 Files: bin/sugar-activity
 Copyright: 2006-2008, Red Hat, Inc
 License: GPL-2+
@@ -477,14 +477,14 @@ License: LGPL-2+
  FIXME
 
 Files: src/sugar3/presence/connectionmanager.py
-Copyright: 2010, Collabora Ltd. <http://www.collabora.co.uk/>
+Copyright: 2010, Collabora Ltd. <http:www.collabora.co.uk/>
 License: LGPL-2+
  FIXME
 
 Files: src/sugar3/activity/activity.py
 Copyright: 2006-2007, Red Hat, Inc
   2007-2009, One Laptop Per Child
-  2010, Collabora Ltd. <http://www.collabora.co.uk/>
+  2010, Collabora Ltd. <http:www.collabora.co.uk/>
 License: LGPL-2+
  FIXME
 
@@ -549,7 +549,7 @@ License: LGPL-2+
  FIXME
 
 Files: src/sugar3/presence/tubeconn.py
-Copyright: 2007, Collabora Ltd. <http://www.collabora.co.uk/>
+Copyright: 2007, 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-toolkit-gtk3.git