[Pkg-sugar-commit] [sugar-toolkit-gtk3] 05/06: Update licensing info: Merge pseudo-derived licenses (Use License-Grant to indicate difference in verbatim text).

[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 37b8624c08bc63f060fbdd8d8028b3d60f92d4d4
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Sep 14 15:44:36 2015 +0200

    Update licensing info: Merge pseudo-derived licenses (Use License-Grant to indicate difference in verbatim text).
---
 debian/copyright | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 10effe6..60ae8a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -60,7 +60,11 @@ License: BSD-3-clause~Django and BSD-3-clause~Patrick
 
 Files: */Makefile.in
 Copyright: 1994-2013, Free Software Foundation, Inc.
-License: GAP~Makefile.in
+License-Grant:
+ This Makefile.in is free software; the Free Software Foundation gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+License: GAP
 
 Files: ./src/sugar3/acme-*
 Copyright: 2002-2003, Bastien Nocera
@@ -69,7 +73,7 @@ License-Grant:
  modify it under the terms of the GNU Library General Public License as
  published by the Free Software Foundation; either version 2 of the
  License, or (at your option) any later version.
-License: LGPL-2+~Gnome
+License: LGPL-2+
 
 Files: aclocal.m4
  config.guess
@@ -98,7 +102,10 @@ License: GAP
 
 Files: configure
 Copyright: 1992-1996,1998-2012, Free Software Foundation, Inc.
-License: GAP~configure
+License-Grant:
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+License: GAP
 
 Files: ltmain.sh
  m4/libtool.m4
@@ -132,7 +139,12 @@ License: X11
 Files: po/Makefile.in.in
 Copyright: 1995-1997, Ulrich Drepper <drepper at gnu.ai.mit.edu>
   2004-2008, Rodney Dawes <dobey.pwns at gmail.com>
-License: GAP~gettext
+License-Grant:
+ This file may be copied and used freely without restrictions.  It may
+ be used in projects which are not available under a GNU Public License,
+ but which still want to provide support for the GNU gettext
+ functionality.
+License: GAP
 
 Files: debian/*
 Copyright: 2012,2015, Jonas Smedegaard <dr at jones.dk>
@@ -146,9 +158,6 @@ License: GPL-3+
 License: LGPL-2+
 License-Reference: /usr/share/common-licenses/LGPL-2
 
-License: LGPL-2+~Gnome
-License-Reference: /usr/share/common-licenses/LGPL-2
-
 License: LGPL-2.1+
 License-Reference: /usr/share/common-licenses/LGPL-2.1
 
@@ -163,21 +172,6 @@ License: GAP
  unlimited permission to copy and/or distribute it, with or without
  modifications, as long as this notice is preserved.
 
-License: GAP~Makefile.in
- This Makefile.in is free software; the Free Software Foundation gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
-License: GAP~configure
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
-License: GAP~gettext
- This file may be copied and used freely without restrictions.  It may
- be used in projects which are not available under a GNU Public License,
- but which still want to provide support for the GNU gettext
- functionality.
-
 License: X11
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the

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