[Pkg-sugar-commit] [sugar-toolkit] 15/21: Rewrite copyright file using format 1.0.

Jonas Smedegaard dr at jones.dk
Thu Apr 16 18:50:25 UTC 2015


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

js pushed a commit to annotated tag debian/0.84.17-1
in repository sugar-toolkit.

commit 05a951ca533f862e5f53977bce9921db7749da1b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu May 24 21:18:16 2012 +0200

    Rewrite copyright file using format 1.0.
---
 debian/copyright | 268 ++++++++++++++++++++-----------------------------------
 1 file changed, 99 insertions(+), 169 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e497266..1fa6d90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,178 +1,125 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: sugar-toolkit
-Maintainer: sugar-devel at lists.sugarlabs.org
-	irc://irc.freenode.net/sugar
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: sugar-toolkit
+Upstream-Contact: sugar-devel at lists.sugarlabs.org
+ irc://irc.freenode.net/sugar
 Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/
-	git://git.sugarlabs.org/sugar-toolkit/mainline
+ git://git.sugarlabs.org/sugar-toolkit/mainline
 
-Copyright: 2002,2006-2008, Red Hat, Inc
+Files: *
+Copyright: 1998, Carsten Schaar, and twm
+  1998, The Open Group
+  1998,2001, Tim Janik
+  1999-2000,2002,2006-2008, Red Hat, Inc
+  2001, George Lebl
+  2003, Josiah Carlson
+  2004-2006, Christian Hammond
+  2007, Eduardo Silva <edsiper at gmail.com>
+  2007, Novell, Inc
+  2006-2010, One Laptop Per Child
+  2008, Benjamin Berg <benjamin at sipsolutions.net>
+  2009, Aleksey Lim
 License: LGPL-2+
 
-Files: ./src/sugar/gsm-*
-Copyright: 2007, Novell, Inc
+Files: src/sugar/gsm-*
+Copyright: 2006-2007, Novell, Inc
 License: GPL-2+
+Comment:
+ gsm-app.h contains copyright but no licensing.  It is assumed the same
+ licensing applies as for gsm-app.c.
 
-Files: ./src/sugar/activity/namingalert.py,
-	./src/sugar/bundle/bundleversion.py,
-	./src/sugar/datastore/__init__.py,
-	./src/sugar/datastore/datastore.py,
-	./src/sugar/graphics/alert.py,
-	./src/sugar/graphics/canvastextview.py,
-	./src/sugar/graphics/combobox.py,
-	./src/sugar/graphics/iconentry.py,
-	./src/sugar/graphics/objectchooser.py,
-	./src/sugar/graphics/tray.py
-Copyright: 2007-2010, One Laptop Per Child
-License: LGPL-2+
-
-Files: Makefile.in
+Files: */Makefile.in
 Copyright: 1992-2008, Free Software Foundation, Inc.
-License: other-GAP-FSF
+License: GAP~Makefile.in
 
 Files: ./src/sugar/acme-*
 Copyright: 2002-2003, Bastien Nocera
-License: LGPL-2+
-
-Files: ./src/sugar/eggdesktopfile.h,
-	./src/sugar/eggsmclient*
-Copyright: 2007, Novell, Inc
-License: LGPL-2+
-
-Files: ./src/sugar/activity/activity.py,
-	./src/sugar/datastore/dbus_helpers.py,
-	./src/sugar/graphics/radiotoolbutton.py,
-	./src/sugar/graphics/toolbutton.py
-Copyright: 2006-2007, Red Hat, Inc
-	2006-2009, One Laptop Per Child
-License: LGPL-2+
-
-Files: ./config.guess,
-	./config.sub,
-	./depcomp,
-	./py-compile
+License: LGPL-2+~Gnome
+
+Files: aclocal.m4
+ config.guess
+ config.sub
+ depcomp
+ m4/intltool.m4
+ missing
+ py-compile
 Copyright: 1992-2009, Free Software Foundation, Inc.
-License: GPL-2+ or other-SA-Autoconf
-
-Files: ./src/sugar/sexy-icon-entry.[ch]
-Copyright: 2004-2006, Christian Hammond
-License: LGPL-2+
+  2001, Eazel, Inc
+  2001-2004, Red Hat, Inc
+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: ./m4/lt*
+Files: m4/lt*
 Copyright: 2004-2005,2007-2008, Free Software Foundation, Inc.
-License: other-GAP-FSF
+License: GAP
 
-Files: ./missing
-Copyright: 1996-1997,1999-2000,2002-2006, Free Software Foundation, Inc.
-	1996, Fran,cois Pinard <pinard at iro.umontreal.ca>
-License: GPL-2+ or other-SA-Autoconf
-
-Files: ./aclocal.m4
-Copyright: 1994-2008, Free Software Foundation, Inc.
-	2001-2004, Red Hat, Inc
-License: GPL-2+ or other-SA-Autoconf
-
-Files: ./configure
+Files: configure
 Copyright: 1992-2009, Free Software Foundation, Inc.
-License: other-GAP-configure
+License: GAP~configure
 
-Files: ./ltmain.sh
-	m4/libtool.m4
+Files: ltmain.sh
+ m4/libtool.m4
 Copyright: 1996-2001,2003-2008, Free Software Foundation, Inc.
-License: GPL-2+ or other-SA-Libtool
-
-Files: m4/intltool.m4
-Copyright: 2001, Eazel, Inc
-License: GPL-2+ or other-SA-Autoconf
-
-Files: ./src/sugar/bundle/contentbundle.py
-Copyright: 2007, Red Hat, Inc
-	2009, Aleksey Lim
-License: LGPL-2+
-
-Files: ./src/sugar/graphics/colorbutton.py
-Copyright: 2007, Red Hat, Inc
-	2008, Benjamin Berg <benjamin at sipsolutions.net>
-License: LGPL-2+
-
-Files: ./src/sugar/eggsmclient-xsmp.c
-Copyright: 1998, Carsten Schaar, and twm
-	1998, The Open Group
-	2007, Novell, Inc
-License: LGPL-2+
-
-Files: ./src/sugar/graphics/notebook.py,
-	./src/sugar/graphics/menuitem.py
-Copyright: 2007, Eduardo Silva <edsiper at gmail.com>
-License: LGPL-2+
-
-Files: ./src/sugar/graphics/palette.py
-Copyright: 2007, Eduardo Silva <edsiper at gmail.com>
-	2008, One Laptop Per Child
-License: LGPL-2+
-
-Files: ./src/sugar/eggdesktopfile.c
-Copyright: 1999-2000, Red Hat Inc
-	2001, George Lebl
-	2007, Novell, Inc
-License: LGPL-2+
-
-Files: ./src/sugar/util.py
-Copyright: 2003, Josiah Carlson
-	2006-2007, Red Hat, Inc
-License: LGPL-2+
-
-Files: ./src/sugar/eggaccelerators.c
-Copyright: 1998,2001, Tim Janik
-	2002, Red Hat, Inc.
-License: LGPL-2+
+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
+ using GNU Libtool, you may include this file under the same
+ distribution terms that you use for the rest of that program.
 
-Files: ./src/sugar/presence/tubeconn.py
+Files: src/sugar/presence/sugartubeconn.py
+ src/sugar/presence/tubeconn.py
 Copyright: 2007, Collabora Ltd. <http://www.collabora.co.uk/>
+  2008, One Laptop Per Child
 License: LGPL-2.1+
 
-Files: ./src/sugar/presence/sugartubeconn.py
-Copyright: 2008, One Laptop Per Child
-License: LGPL-2.1+
-
-Files: ./install-sh
+Files: install-sh
 Copyright: 1994, X Consortium
-License: MIT
-
-Files: ./src/sugar/gsm-app.h
-Copyright: 2006, Novell, Inc
-License: UNKNOWN
+License: MIT~X with X exception
+ Except as contained in this notice, the name of the X Consortium shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from the X Consortium.
 
-Files: ./po/Makefile.in.in
+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: other-GAP-gettext
+  2004-2008, Rodney Dawes <dobey.pwns at gmail.com>
+License: GAP~gettext
 
-Files: ./debian/*
+Files: debian/*
 Copyright: 2008-2010, Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
 
 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
+ 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.
  .
  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.
+ Library General Public License for more details.
+Comment:
+ On Debian systems the 'GNU Library General Public License' version 2 is
+ located in '/usr/share/common-licenses/LGPL-2'.
  .
- Some files differ from above by using "The Gnome Library" instead of
- "This library", but otherwise identical license and disclaimer.
- .
- On Debian systems, the complete text of a recent release of the GNU
- Library General Public License (LGPL) can be found in file
- "/usr/share/common-licenses/LGPL".
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this program.  If not, see
+ You should have received a copy of the 'GNU Library General Public
+ License' along with this program.  If not, see
  <http://www.gnu.org/licenses/>.
 
+License: LGPL-2+~Gnome
+ The Gnome Library is free software; you can redistribute it and/or
+ 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.
+ .
+ The Gnome 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
+ Library General Public License for more details.
+
 License: LGPL-2.1+
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU Lesser General Public License as published
@@ -183,10 +130,9 @@ License: LGPL-2.1+
  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.
- .
- On Debian systems, the complete text of a recent release of the GNU
- Library General Public License (LGPL) can be found in file
- "/usr/share/common-licenses/LGPL".
+Comment:
+ On Debian systems the 'GNU Lesser General Public License' version 2.1
+ is located in '/usr/share/common-licenses/LGPL-2.1'.
  .
  You should have received a copy of the GNU Lesser General Public
  License along with this program.  If not, see
@@ -202,45 +148,34 @@ License: GPL-2+
  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'.
  .
- On Debian systems, the complete text of a recent version of the GNU
- General Public License (GPL) can be found in the file
- "/usr/share/common-licenses/GPL".
- .
- You should have received a copy of the GNU General Public License
+ 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: other-SA-Autoconf
- 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.
-
-License: other-SA-Libtool
- 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
- using GNU Libtool, you may include this file under the same
- distribution terms that you use for the rest of that program.
-
-License: other-GAP-FSF
+License: GAP
  This file 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.
- .
- Some files differ from above by using "This Makefile.in" instead of
- "This file", but otherwise identical license and disclaimer.
 
-License: other-GAP-configure
+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: other-GAP-gettext
+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: MIT
+License: MIT~X
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -259,8 +194,3 @@ License: MIT
  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
- .
- Except as contained in this notice, the name of the X Consortium shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from the X Consortium.

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



More information about the pkg-sugar-commit mailing list