[Pkg-sugar-commit] [sugar-base] 02/09: Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.

Jonas Smedegaard dr at jones.dk
Mon Jun 15 22:08:48 UTC 2015 

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

js pushed a commit to branch master
in repository sugar-base.

commit 867d91da797ef389416cbe81e6edf24b28f7e9b6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jun 15 16:42:20 2015 -0500

    Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.
---
 debian/copyright | 151 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 70 insertions(+), 81 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 94dbe1c..0f101f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,46 +7,68 @@ Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base
  git://git.sugarlabs.org/sugar-base/mainline.git
 
 Files: *
-Copyright: 2006-2007, Red Hat, Inc
-  2007-2008, One Laptop Per Child
+Copyright:
+  © 2006-2007, Red Hat, Inc
+  © 2007-2008, One Laptop Per Child
+License-Grant:
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser 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+
 
 Files: src/sugar/xdgmime*
-Copyright: 2003-2004, Jonathan Blandford <jrb at alum.mit.edu>
-  2003-2004, Red Hat, Inc
-  2004-2005, Matthias Clasen <mclasen at redhat.com>
-License: Academic or LGPL-2+
+Copyright:
+  © 2003-2004, Jonathan Blandford <jrb at alum.mit.edu>
+  © 2003-2004, Red Hat, Inc
+  © 2004-2005, Matthias Clasen <mclasen at redhat.com>
+License-Grant:
+ Licensed under the Academic Free License version 2.0
+ Or under the following terms:
+ .
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser 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+
+Comment:
+ No "Academic Free License" text was included with upstream source, and
+ even if quite likely https://spdx.org/licenses/AFL-2.0.html no attempt
+ has been done to clarify as the alternative LGPL-2+ license is suitable
+ for use with Debian.
 
 Files: m4/lt*
-Copyright: 2004-2005, 2007-2009, Free Software Foundation, Inc
+Copyright:
+  © 2004-2005, 2007-2009, Free Software Foundation, Inc
 License: GAP
 
 Files: src/sugar/dispatch/*
-Copyright: 2001-2003, Patrick K. O'Brien and Contributors
-  ????, Django Software Foundation and individual contributors.
+Copyright:
+  © 2001-2003, Patrick K. O'Brien and Contributors
+  © ????, Django Software Foundation and individual contributors.
 License: BSD-3-clause~O'Brien
 
 Files: */Makefile.in
-Copyright: 1994-2009, Free Software Foundation, Inc.
+Copyright:
+  © 1994-2009, Free Software Foundation, Inc.
 License: GAP~Makefile.in
 
-Files: config.*
+Files: aclocal.m4
+ config.*
  depcomp
+ m4/intltool.m4
  missing
  py-compile
-Copyright: 1992-2009, Free Software Foundation
-License: GPL-2+ with Autoconf exception
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a configuration
- script generated by Autoconf, you may include it under the same
- distribution terms that you use for the rest of that program.
-
-Files: aclocal.m4
- m4/intltool.m4
-Copyright: 1992-2009, Free Software Foundation
-  2000-2001, Eazel, Inc
-  2001-2004, Red Hat, Inc
-  2004, Scott James Remnant <scott at netsplit.com>
+Copyright:
+  © 1992-2009, Free Software Foundation
+  © 2000-2001, Eazel, Inc
+  © 2001-2004, Red Hat, Inc
+  © 2004, Scott James Remnant <scott at netsplit.com>
+License-Grant:
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
 License: GPL-2+ with Autoconf exception
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program that contains a configuration
@@ -55,7 +77,13 @@ License: GPL-2+ with Autoconf exception
 
 Files: m4/libtool.m4
  ltmain.sh
-Copyright: 1996-2001,2003-2010, Free Software Foundation, Inc
+Copyright:
+  © 1996-2001,2003-2010, Free Software Foundation, Inc
+License-Grant:
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
 License: GPL-2+ with Libtool exception
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program or library that is built
@@ -63,78 +91,39 @@ License: GPL-2+ with Libtool exception
  distribution terms that you use for the rest of that program.
 
 Files: install-sh
-Copyright: 1994, X Consortium
+Copyright:
+  © 1994, X Consortium
 License: X11
 
 Files: configure
-Copyright: 1992-1996, 1998-2010, Free Software Foundation, Inc.
+Copyright:
+  © 1992-1996, 1998-2010, Free Software Foundation, Inc.
 License: GAP~configure
 
 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>
+Copyright:
+  © 1995-1997, Ulrich Drepper <drepper at gnu.ai.mit.edu>
+  © 2004-2008, Rodney Dawes <dobey.pwns at gmail.com>
 License: GAP~gettext
 
 Files: debian/*
-Copyright: 2007-2012,2015, Jonas Smedegaard <dr at jones.dk>
+Copyright:
+  © 2007-2012,2015, Jonas Smedegaard <dr at jones.dk>
+License-Grant:
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 3 of the License, or (at your
+ option) any later version.
 License: GPL-3+
 
 License: LGPL-2+
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
-Comment:
- On Debian systems the 'GNU Lesser General Public License' version 2 is
- located in '/usr/share/common-licenses/LGPL-2'.
- .
- You should have received a copy of the 'GNU Lesser General Public
- License' along with this program.  If not, see
- <http://www.gnu.org/licenses/>.
+License-Reference: /usr/share/common-licenses/LGPL-2
 
 License: GPL-2+
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-Comment:
- On Debian systems the 'GNU General Public License' version 2 is located
- in '/usr/share/common-licenses/GPL-2'.
- .
- You should have received a copy of the 'GNU General Public License'
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+License-Reference: /usr/share/common-licenses/GPL-2
 
 License: GPL-3+
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 3 of the License, or (at your
- option) any later version.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-Comment:
- On Debian systems the 'GNU General Public License' version 3 is located
- in '/usr/share/common-licenses/GPL-3'.
-
-License: Academic
- Licensed under the Academic Free License version 2.0
-Comment:
- No actual license is included with upstream source, and even if it is
- quite likely http://opensource-definition.org/licenses/afl-2.0.html no
- attempt has been done to resolve this as it has in all cases been dual-
- licensed with GPL-2+ which in reality is used with Debian.
+License-Reference: /usr/share/common-licenses/GPL-3
 
 License: BSD-3-clause~O'Brien
  Copyright (c) 2001-2003, Patrick K. O'Brien and Contributors

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

More information about the pkg-sugar-commit mailing list