Update debian/copyright and copyright hints.

+ Rewrite debian/copyright using new file format, version 428
+ Add info on CDBS snippets (new owners, no new licenses)
+ Set Sugarlabs (not Redhat) as upstream maintainer, and add both
  old laptop.org and new sugarlabs.org source URLs.
+ Update copyright years
+ Fix licensing change LGPL -> GPL (changed at 0.79.x)
+ Include GAP licenses verbatim.

2 files changed, 206 insertions, 175 deletions

diff --git a/debian/copyright b/debian/copyright
index 6ac5dae..d779c00 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,146 +1,114 @@
-This is sugar packaged for Debian GNU systems.
-
-Upstream source: http://dev.laptop.org/pub/sugar/sources/sugar/
-
-Upstream Git source: http://dev.laptop.org/git/sugar
-
-Upstream author: Red Hat, Inc.
-
-Files: debian/*
-Copyright: © 2007-2008 Jonas Smedegaard <dr@jones.dk>
-License: GPL-2+
-
-Files: src/*, service/bundleregistry.py
-Copyright: © 2006-2007, Red Hat, Inc.
-License: GPL-2+
-
-Files: src/controlpanel/cmd.py, src/controlpanel/model/datetime.py,
- src/controlpanel/model/language.py, src/controlpanel/toolbar.py
-Copyright: © 2007-2008 One Laptop Per Child
-License: GPL-2+
-
-Files: src/model/Owner.py, src/view/devices/network/mesh.py,
- src/view/frame/activitiestray.py, src/view/home/favoritesview.py
-Copyright: © 2008 One Laptop Per Child
-	   © 2006-2007, Red Hat, Inc.
-License: GPL-2+
-
-Files: config.py, config.py.in, bin/*, src/session.py,
- src/view/home/launchbox.py
-Copyright: © 2008, Red Hat, Inc.
-License: GPL-2+
-
-Files: src/intro/*, src/model/devices/device*.py,
- src/view/frame/eventarea.py, src/view/home/proc_smaps.py,
- src/view/home/transitionbox.py
-Copyright: © 2007, Red Hat, Inc.
-License: GPL-2+
-
-Files: tests/*, src/view/home/*layout.py, src/logsmanager.py,
- src/controlpanel/control.py, src/view/home/spreadlayout.py
-Copyright: © 2007, Red Hat, Inc.
-License: LGPL-2+
-
-Files: src/view/home/snowflakelayout.py
-Copyright: © 2006-2007, Red Hat, Inc.
-License: LGPL-2+
-
-Files: src/view/home/grid.py
-Copyright: © 2008 One Laptop Per Child
-	   © 2007 Red Hat, Inc
-License: GPL-2+
-
-Files: src/model/devices/speaker.py, src/view/devices/speaker.py
-Copyright: © 2008 Martin Dengler
-License: GPL-2+
-
-Files: src/view/tabbinghandler.py
-Copyright: © 2008, Benjamin Berg <benjamin@sipsolutions.net>
-License: GPL-2+
-
-Files: bin/sugar-launch, maint-helper.py
-Copyright: © 2007, Red Hat, Inc.
-License: GPL-2+
-
-Files: service/clipboardservice.py, src/emulator.py, src/main.py
-Copyright: © 2006, Red Hat, Inc.
-License: GPL-2+
-
-Files: service/activityregistryservice.py
-Copyright: © 2007, One Laptop Per Child
-	   © 2006-2007, Red Hat, Inc
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=428
+Upstream-Name: Untrusted draft - double-check copyrights yourself!
+Upstream-Name: sugar
+Upstream-Maintainer: Sugarlabs <sugar-devel@lists.sugarlabs.org>
+	http://lists.sugarlabs.org/listinfo/sugar-devel
+Upstream-Source: http://dev.laptop.org/pub/sugar/sources/sugar/
+	git://dev.laptop.org/sugar
+	http://download.sugarlabs.org/sources/sucrose/glucose/sugar
+	git://git.sugarlabs.org/sugar/mainline.git
+
+Files: *
+Copyright: 2006-2008, Red Hat, Inc
+Copyright: 2007-2008, One Laptop Per Child
 License: GPL-2+
 
-Files: src/view/clipboardicon.py
-Copyright: © 2007, One Laptop Per Child
-	   © 2007, Red Hat, Inc
-License: GPL-2+
+Files: Makefile.in
+Copyright: 1994-2008, Free Software Foundation, Inc.
+License: GAP
+ 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.
 
-Files: service/sugar-shell-service
-Copyright: © 2007, One Laptop Per Child
-	   © 2006, Red Hat, Inc
+Files: src/model/devices/speaker.py
+	src/view/devices/speaker.py
+Copyright: 2008, Martin Dengler
 License: GPL-2+
 
-Files: src/controlpanel/inlinealert.py, src/controlpanel/sectionview.py,
- src/controlpanel/view/aboutme.py, src/controlpanel/view/aboutxo.py,
- src/controlpanel/view/datetime.py, src/controlpanel/view/frame.py,
- src/controlpanel/view/language.py, src/controlpanel/view/network.py
-Copyright: © 2008, OLPC
+Files: ./intltool-*
+	./missing
+	./py-compile
+Copyright: 1996-1997, 1999-2006, Free Software Foundation, Inc.
+	2000-2001, Eazel, Inc
 License: GPL-2+
 
-Files: service/__init__.py, service/clipboardobject.py,
- src/view/clipboardmenu.py, src/view/frame/clipboardpanelwindow.py,
- src/view/frame/clipboardtray.py
-Copyright: © 2007, One Laptop Per Child
+Files: src/model/homemodel.py
+Copyright: 2006-2007, Owen Williams
 License: GPL-2+
 
-Files: src/controlpanel/control.py, src/view/frame/activitybutton.py
-Copyright: © 2007, One Laptop Per Child
-License: LGPL-2+
-
 Files: data/em.py
 Copyright: © 2002-2003 Erik Max Francis <max@alcyone.com>
 License: GPL-2+
 
-Files: src/model/homeactivity.py, src/model/homemodel.py
-Copyright: © 2006-2007 Owen Williams.
+Files: src/model/homeactivity.py
+Copyright: 2006-2007, Owen Williams
 License: GPL-2+
 
-Files: bin/sugar-activity
-Copyright: 2006-2008, Red Hat, Inc
+Files: src/view/frame/frameinvoker.py
+Copyright: 2007, Eduardo Silva <edsiper@gmail.com>
 License: GPL-2+
 
-Files: src/view/frame/frameinvoker.py
-Copyright: © 2007, Eduardo Silva <edsiper@gmail.com>
-License: LGPL-2+
+Files: src/view/tabbinghandler.py
+Copyright: 2008, Benjamin Berg <benjamin@sipsolutions.net>
+License: GPL-2+
+
+Files: ./install-sh
+Copyright: 1994, X Consortium
+License: MIT
+ 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 without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION 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 deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.
+
+Files: ./configure
+Copyright: 1992-1996, 1998-2006, Free Software Foundation, Inc.
+License: GAP
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
 
-Files: po/Makefile.in.in
-Copyright: © 1995-1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-	   © 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
+Files: ./aclocal.m4
+Copyright: 1995-2008, Free Software Foundation, Inc
+	2001-2004, Red Hat, Inc
 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.
 
-Files: Makefile.in
-Copyright © 1994-2006  Free Software Foundation, Inc.
+Files: po/Makefile.in.in
+Copyright: 1995-1997, by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+	2004-2008, Rodney Dawes <dobey.pwns@gmail.com>
 License: GAP
+ 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.
+
+Files: debian/*
+Copyright: 2002-2003, Colin Walters <walters@debian.org>
+	2003-2008, Jonas Smedegaard <dr@jones.dk>
+License: GPL-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.
-
-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.
-
-License: GAP
- 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.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in file "/usr/share/common-licenses/GPL", and the complete
-text of the GNU Lesser General Public License can be found in file
-"/usr/share/common-licenses/LGPL"..
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ (GPL) version 2 can be found in file "/usr/share/common-licenses/GPL".
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 5d8b401..eb07cbd 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,6 +1,84 @@
 Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX
 Upstream-Name: Untrusted draft - double-check copyrights yourself!
 
+Files: AUTHORS
+	Makefile.am
+	README
+	bin/Makefile.am
+	bin/sugar
+	bin/sugar-backup
+	bin/sugar-install-bundle
+	bin/sugar.in
+	configure.ac
+	data/Makefile.am
+	data/activities.defaults
+	data/gtkrc.em
+	data/icons/Makefile.am
+	data/icons/module-about_me.svg
+	data/icons/module-about_my_xo.svg
+	data/icons/module-date_and_time.svg
+	data/icons/module-frame.svg
+	data/icons/module-language.svg
+	data/icons/module-network.svg
+	data/icons/module-power.svg
+	data/kbdconfig
+	data/mime.defaults
+	data/sugar-xo.gtkrc
+	data/sugar.desktop
+	data/sugar.gtkrc
+	data/sugar.xml.in
+	debian/README.cdbs-tweaks
+	debian/README.packaging
+	debian/compat
+	debian/control
+	debian/control.in
+	debian/gbp.conf
+	debian/patches/0001_sync_git_head.patch
+	debian/patches/0002_remove_unused_glive.py.patch
+	debian/patches/2001_empy_from_system.patch
+	debian/patches/2002_wpa_passphrase_in_usr-bin.patch
+	debian/patches/2003_fix_tz_config_path.patch
+	debian/patches/2004_strip_dbus_interface_hints.patch
+	debian/patches/2991_enable_danish_l10n.patch
+	debian/patches/2992_remove_unused_glive.py.patch
+	debian/patches/README
+	debian/patches/series
+	debian/pycompat
+	debian/sugar-emulator.desktop
+	debian/sugar.desktop
+	debian/sugar.install
+	debian/sugar.menu
+	debian/watch
+	po/ChangeLog
+	po/POTFILES.in
+	po/POTFILES.skip
+	po/de.po
+	po/pl.po
+	service/Makefile.am
+	service/org.laptop.ActivityRegistry.service.in
+	service/org.laptop.Clipboard.service.in
+	src/Makefile.am
+	src/controlpanel/Makefile.am
+	src/controlpanel/model/Makefile.am
+	src/controlpanel/view/Makefile.am
+	src/hardware/Makefile.am
+	src/hardware/NetworkManagerInfo.conf
+	src/hardware/schoolserver.py
+	src/intro/Makefile.am
+	src/intro/__init__.py
+	src/intro/default-picture.png
+	src/intro/glive.py
+	src/model/Makefile.am
+	src/model/devices/Makefile.am
+	src/model/devices/network/Makefile.am
+	src/view/Makefile.am
+	src/view/devices/Makefile.am
+	src/view/devices/network/Makefile.am
+	src/view/frame/Makefile.am
+	src/view/home/Makefile.am
+Copyright: *No copyright*
+License: UNKNOWN
+
 Files: po/af.po
 	po/am.po
 	po/ar.po
@@ -58,62 +136,6 @@ Files: po/af.po
 Copyright: YEAR THE PACKAGE'S HOLDER
 License: UNKNOWN
 
-Files: AUTHORS
-	Makefile.am
-	README
-	bin/Makefile.am
-	bin/sugar
-	bin/sugar-backup
-	bin/sugar-install-bundle
-	bin/sugar.in
-	configure.ac
-	data/Makefile.am
-	data/activities.defaults
-	data/gtkrc.em
-	data/icons/Makefile.am
-	data/icons/module-about_me.svg
-	data/icons/module-about_my_xo.svg
-	data/icons/module-date_and_time.svg
-	data/icons/module-frame.svg
-	data/icons/module-language.svg
-	data/icons/module-network.svg
-	data/icons/module-power.svg
-	data/kbdconfig
-	data/mime.defaults
-	data/sugar-xo.gtkrc
-	data/sugar.desktop
-	data/sugar.gtkrc
-	data/sugar.xml.in
-	po/ChangeLog
-	po/POTFILES.in
-	po/POTFILES.skip
-	po/de.po
-	po/pl.po
-	service/Makefile.am
-	service/org.laptop.ActivityRegistry.service.in
-	service/org.laptop.Clipboard.service.in
-	src/Makefile.am
-	src/controlpanel/Makefile.am
-	src/controlpanel/model/Makefile.am
-	src/controlpanel/view/Makefile.am
-	src/hardware/Makefile.am
-	src/hardware/NetworkManagerInfo.conf
-	src/hardware/schoolserver.py
-	src/intro/Makefile.am
-	src/intro/__init__.py
-	src/intro/default-picture.png
-	src/intro/glive.py
-	src/model/Makefile.am
-	src/model/devices/Makefile.am
-	src/model/devices/network/Makefile.am
-	src/view/Makefile.am
-	src/view/devices/Makefile.am
-	src/view/devices/network/Makefile.am
-	src/view/frame/Makefile.am
-	src/view/home/Makefile.am
-Copyright: *No copyright*
-License: UNKNOWN
-
 Files: service/bundleregistry.py
 	src/controlpanel/__init__.py
 	src/hardware/__init__.py
@@ -274,6 +296,23 @@ Files: service/clipboardservice.py
 Copyright: 2006, Red Hat, Inc
 License: GPL-2+
 
+Files: debian/cdbs/1/class/autotools-vars.mk
+	debian/cdbs/1/class/makefile.mk
+Copyright: 2002-2003, Colin Walters <walters@debian.org>
+	2003,2008, Jonas Smedegaard <dr@jones.dk>
+License: GPL
+
+Files: debian/cdbs/1/class/autotools.mk
+	debian/cdbs/1/class/makefile-vars.mk
+Copyright: 2002-2003, Colin Walters <walters@debian.org>
+	2008, Jonas Smedegaard <dr@jones.dk>
+License: GPL
+
+Files: debian/cdbs/1/class/python-autotools.mk
+	debian/cdbs/1/rules/package-relations.mk
+Copyright: 2008, Jonas Smedegaard <dr@jones.dk>
+License: GPL
+
 Files: src/model/devices/speaker.py
 	src/view/devices/speaker.py
 Copyright: 2008, Martin Dengler
@@ -296,6 +335,22 @@ Files: intltool-update.in
 Copyright: 2000-2003, Free Software Foundation
 License: GPL (GENERATED FILE)
 
+Files: debian/cdbs/1/class/python-vars.mk
+Copyright: 2003,2008, Jonas Smedegaard <dr@jones.dk>
+License: GPL
+
+Files: debian/cdbs/1/rules/buildinfo.mk
+Copyright: 2004-2007, Jonas Smedegaard <dr@jones.dk>
+License: GPL
+
+Files: debian/cdbs/1/rules/upstream-tarball.mk
+Copyright: 2007-2008, Jonas Smedegaard <dr@jones.dk>
+License: GPL
+
+Files: debian/cdbs/1/rules/copyright-check.mk
+Copyright: \s*(\S.*?)\s*\
+License: GPL
+
 Files: intltool-extract.in
 Copyright: 2000-2001, 2003, Free Software Foundation
 License: GPL-2+ (GENERATED FILE)
@@ -372,6 +427,14 @@ Files: po/fr.po
 Copyright: 2007, the Package Owner
 License: UNKNOWN
 
+Files: debian/rules
+Copyright: 2007-2008, Jonas Smedegaard <dr@jones.dk>
+License: UNKNOWN
+
+Files: debian/patches/1001_danish_l10n.patch
+Copyright: 2008, Jonas Smedegaard <dr@jones.dk>
+License: UNKNOWN
+
 Files: po/ig.po
 Copyright: YEAR THE PACKAGE'S HOLDER, 2006
 License: UNKNOWN