Use new proposed copyright-format for debian/copyright and copyright-hints.

* Restructure output of copyright-check.mk to match new proposed
  copyright-format at
  http://wiki.debian.org/Proposals/CopyrightFormat .
* Adjust debian/copyright to follow new proposed copyright-format.

4 files changed, 476 insertions, 173 deletions

diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index 645363b..ee0659b 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -28,6 +28,9 @@ include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7)
 
+# Set to yes to fail on changed/new hints are found
+#DEB_COPYRIGHT_CHECK_STRICT := yes
+
 # Single regular expression for files to include or ignore
 DEB_COPYRIGHT_CHECK_REGEX = .*
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
@@ -35,13 +38,17 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\
 pre-build:: debian/stamp-copyright-check
 
 debian/stamp-copyright-check:
-	@echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
+	@echo 'Scanning upstream source for new/changed copyright notices...'
+	@echo licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+		"| some-output-filtering..."
 
 # Perl in shell in make requires extra care:
 #  * Single-quoting ('...') protects against shell expansion
 #  * Double-dollar ($$) expands to plain dollar ($) in make
-	licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+	@licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
 		| LC_ALL=C perl -e \
+	'print "Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX\n";'\
+	'print "Upstream-Name: Untrusted draft - double-check copyrights yourself!\n\n";'\
 	'$$n=0; while (<>) {'\
 	'	s/[^[:print:]]//g;'\
 	'	if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\
@@ -56,8 +63,13 @@ debian/stamp-copyright-check:
 	'foreach $$file (@files) {'\
 	'	$$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\
 	'	$$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\
+	'	$$file->{license} =~ s/\s*(\*No copyright\*)\s*// and $$file->{copyright} = $$1;'\
+	'	$$file->{license} =~ s/^\s*(GENERATED FILE)/UNKNOWN ($$1)/;'\
+	'	$$file->{license} =~ s/\s+(GENERATED FILE)/ ($$1)/;'\
 	'	$$file->{copyright} =~ s/(?<=(\b\d{4}))(?{$$y=$$^N})\s*[,-]\s*((??{$$y+1}))\b/-$$2/g;'\
 	'	$$file->{copyright} =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;'\
+	'	$$file->{copyright} =~ s/\b(\d{4})\s+([\S^\d])/$$1, $$2/g;'\
+	'	$$file->{copyright} =~ s/\s+\/\s+/\n\t/g;'\
 	'	$$pattern = "$$file->{license} [$$file->{copyright}]";'\
 	'	push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
 	'};'\
@@ -66,7 +78,10 @@ debian/stamp-copyright-check:
 	'			||'\
 	'			$$a cmp $$b'\
 	'		} keys %patternfiles ) {'\
-	'	print "$$pattern: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'	($$license, $$copyright) = $$pattern =~ /(.*) \[(.*)\]/s;'\
+	'	print "Files: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'	print "Copyright: $$copyright\n";'\
+	'	print "License: $$license\n\n";'\
 	'};'\
 		> debian/copyright_newhints
 	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \
@@ -74,13 +89,14 @@ debian/stamp-copyright-check:
 	@if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi
 	@newstrings=`diff -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' - | sed 's/^\+//'`; \
 		if [ -n "$$newstrings" ]; then \
-			echo "WARNING: The following new or changed copyright notices discovered:"; \
+			echo "$(if $(DEB_COPYRIGHT_CHECK_STRICT),ERROR,WARNING): The following new or changed copyright notices discovered:"; \
 			echo; \
 			echo "$$newstrings"; \
 			echo; \
 			echo "To fix the situation please do the following:"; \
 			echo "  1) Investigate the above changes and update debian/copyright as needed"; \
 			echo "  2) Replace debian/copyright_hints with debian/copyright_newhints"; \
+			$(if $(DEB_COPYRIGHT_CHECK_STRICT),exit 1,:); \
 		else \
 			echo 'No new copyright notices found - assuming no news is good news...'; \
 			rm -f debian/copyright_newhints; \
diff --git a/debian/changelog b/debian/changelog
index be70f64..8171a47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ sugar-toolkit (0.81.6-1) unstable; urgency=low
   * Drop patch 1002 and 2992 (gettext rename fixed upstream now).
   * Update patch 2991 (other translations added now, that danish needs
     to merge with).
+  * Restructure output of copyright-check.mk to match new proposed
+    copyright-format at
+    http://wiki.debian.org/Proposals/CopyrightFormat .
+  * Adjust debian/copyright to follow new proposed copyright-format.
 
  -- Jonas Smedegaard <dr@jones.dk>  Thu, 10 Jul 2008 13:48:53 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 5bb207c..50ab776 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,140 +1,196 @@
-This is sugar toolkit packaged for Debian GNU systems.
-
-Upstream source: http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/
-
-Upstream Git source: git://dev.laptop.org/sugar-toolkit
-
-Upstream author: Red Hat, Inc.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=184
+Upstream-Name: sugar toolkit
+Upstream-Maintainer: sugar@lists.laptop.org
+                     irc://irc.freenode.net/sugar
+Upstream-Source: http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/
+                 git://dev.laptop.org/sugar-toolkit
 
 Files: debian/*
-Copyright: © 2008 Jonas Smedegaard <dr@jones.dk>
+Copyright: 2008 Jonas Smedegaard <dr@jones.dk>
 License: GPL-2+
 
-Files: src/sugar/bundle/*, src/sugar/graphics/*, src/sugar/presence/*,
- src/sugar/sugar-preview.[ch], src/sugar/wm.py
-Copyright: © 2007, Red Hat, Inc.
+Files: src/sugar/_sugarextmodule.c
+	src/sugar/activity/__init__.py
+	src/sugar/activity/activityfactory.py
+	src/sugar/activity/activityhandle.py
+	src/sugar/activity/activityservice.py
+	src/sugar/bundle/__init__.py
+	src/sugar/env.py
+	src/sugar/graphics/__init__.py
+	src/sugar/graphics/icon.py
+	src/sugar/graphics/roundbox.py
+	src/sugar/graphics/xocolor.py
+	src/sugar/network.py
+	src/sugar/presence/__init__.py
+	src/sugar/profile.py
+	src/sugar/sugar-address-entry.[ch]
+	src/sugar/sugar-key-grabber.[ch]
+	src/sugar/sugar-menu.[ch]
+	src/sugar/util.py
+Copyright: 2006-2007, Red Hat, Inc
 License: LGPL-2+
 
-Files: src/sugar/graphics/palettegroup.py
-Copyright: © 2006-2007, Red Hat, Inc.
+Files: src/sugar/bundle/activitybundle.py
+	src/sugar/bundle/bundle.py
+	src/sugar/bundle/contentbundle.py
+	src/sugar/graphics/animator.py
+	src/sugar/graphics/entry.py
+	src/sugar/graphics/palettegroup.py
+	src/sugar/graphics/panel.py
+	src/sugar/graphics/style.py
+	src/sugar/graphics/toggletoolbutton.py
+	src/sugar/graphics/toolbox.py
+	src/sugar/graphics/toolcombobox.py
+	src/sugar/graphics/window.py
+	src/sugar/presence/activity.py
+	src/sugar/presence/buddy.py
+	src/sugar/presence/presenceservice.py
+	src/sugar/sugar-preview.[ch]
+	src/sugar/wm.py
+Copyright: 2007, Red Hat, Inc
 License: LGPL-2+
 
-Files: src/sugar/graphics/toolbutton.py
-Copyright: © 2008, One Laptop Per Child
-	   © 2007, Red Hat, Inc.
-License: LGPL-2+
+Files: src/sugar/gsm-app.c
+	src/sugar/gsm-client-xsmp.[ch]
+	src/sugar/gsm-client.[ch]
+	src/sugar/gsm-session.[ch]
+	src/sugar/gsm-xsmp.[ch]
+Copyright: 2007, Novell, Inc
+License: GPL-2+
 
-Files: src/sugar/eggaccelerators.c
-Copyright: © 2002 Red Hat, Inc.
-	   © 1998, 2001 Tim Janik
+Files: src/sugar/clipboard/__init__.py
+	src/sugar/clipboard/clipboardservice.py
+	src/sugar/datastore/__init__.py
+	src/sugar/datastore/datastore.py
+	src/sugar/graphics/alert.py
+	src/sugar/graphics/combobox.py
+	src/sugar/graphics/iconentry.py
+	src/sugar/graphics/objectchooser.py
+	src/sugar/graphics/tray.py
+Copyright: 2007, One Laptop Per Child
 License: LGPL-2+
 
-Files: src/sugar/eggaccelerators.h
-Copyright: © 2002 Red Hat, Inc.
+Files: Makefile.in, ./aclocal.m4
+Copyright: 1994-2005, Free Software Foundation, Inc.
+License: GAP
+
+Files: src/sugar/eggdesktopfile.h
+	src/sugar/eggsmclient-private.h
+	src/sugar/eggsmclient.[ch]
+Copyright: 2007, Novell, Inc
 License: LGPL-2+
 
-Files: src/sugar/clipboard/*, src/sugar/datastore/*,
- src/sugar/graphics/alert.py, src/sugar/graphics/combobox.py,
- src/sugar/graphics/iconentry.py, src/sugar/graphics/objectchooser.py,
- src/sugar/graphics/tray.py
-Copyright: © 2007, One Laptop Per Child
+Files: ./depcomp
+Copyright: 1999-2000, 2003-2005, Free Software Foundation, Inc.
+License: GPL-2+ | other-Autoconf
+
+Files: src/sugar/sexy-icon-entry.[ch]
+Copyright: 2004-2006, Christian Hammond
 License: LGPL-2+
 
-Files: src/sugar/graphics/radiotoolbutton.py
-Copyright: © 2007-2008, One Laptop Per Child
-	   © 2007 Red Hat, Inc
+Files: src/sugar/activity/bundlebuilder.py
+	src/sugar/session.py
+Copyright: 2008, Red Hat, Inc
 License: LGPL-2+
 
-Files: src/sugar/activity/bundlebuilder.py, src/sugar/session.py
-Copyright: © 2008 Red Hat, Inc
+Files: ./missing
+Copyright: 1996-1997, 1999-2000, 2002-2006, Free Software Foundation, Inc.
+	1996, Fran,cois Pinard <pinard@iro.umontreal.ca>
+License: GPL-2+ | other-Autoconf
+
+Files: ./py-compile
+Copyright: 2000-2001, 2003-2005, Free Software Foundation, Inc
+License: GPL-2+ | other-Autoconf
+
+Files: ./intltool-merge.in
+Copyright: 2000-2001, Eazel, Inc
+	2000, 2003, Free Software Foundation
+License: GPL-2+ | other-Autoconf
+
+Files: ./intltool-update.in
+Copyright: 2000-2003, Free Software Foundation
+License: GPL-2+ | other-Autoconf
+
+Files: ./ltmain.sh
+Copyright: 1996-2001, 2003-2008, Free Software Foundation, Inc.
+License: GPL-2+ | other-Autoconf
+
+Files: ./intltool-extract.in
+Copyright: 2000-2001, 2003, Free Software Foundation
+License: GPL-2+ | other-Autoconf
+
+Files: m4/intltool.m4
+Copyright: 2001, Eazel, Inc
+License: GPL-2+ | other-Autoconf
+
+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/activity/activity.py
-Copyright: © 2007-2008, One Laptop Per Child
-	   © 2006-2007 Red Hat, Inc
+Files: src/sugar/eggdesktopfile.c
+Copyright: 1999-2000, Red Hat Inc
+	2001, George Lebl
+	2007, Novell, Inc
 License: LGPL-2+
 
-Files: src/sugar/datastore/dbus_helpers.py,
- src/sugar/activity/registry.py
-Copyright: © 2007, One Laptop Per Child
-	   © 2006-2007 Red Hat, Inc
+Files: src/sugar/eggaccelerators.c
+Copyright: 2002, Red Hat, Inc.; 1998, 2001, Tim Janik
 License: LGPL-2+
 
-Files: src/src/sugar/presence/sugartubeconn.py
-Copyright: © 2008, One Laptop Per Child
-License: LGPL-2.1+
+Files: src/sugar/eggaccelerators.h
+Copyright: 2002, Red Hat, Inc
+License: LGPL-2+
 
-Files: src/sugar/presence/tubeconn.py
-Copyright: © 2007 Collabora Ltd. <http://www.collabora.co.uk/>
-License: LGPL-2.1+
+Files: src/sugar/datastore/dbus_helpers.py
+Copyright: 2006-2007, Red Hat, Inc
+	2007, One Laptop Per Child
+License: LGPL-2+
 
-Files: src/sugar/sexy-icon-entry.c, src/sugar/sexy-icon-entry.h
-Copyright: © 2004-2006 Christian Hammond
+Files: src/sugar/activity/activity.py
+Copyright: 2006-2007, Red Hat, Inc
+	2007-2008, One Laptop Per Child
 License: LGPL-2+
 
-Files: src/sugar/graphics/menuitem.py, src/sugar/graphics/notebook.py
-Copyright: © 2007, Eduardo Silva <edsiper@gmail.com>
+Files: src/sugar/graphics/notebook.py
+Copyright: 2007, Eduardo Silva (edsiper@gmail.com)
 License: LGPL-2+
 
 Files: src/sugar/graphics/palette.py
-Copyright: © 2008, One Laptop Per Child
-	   © 2007, Eduardo Silva <edsiper@gmail.com>
+Copyright: 2007, Eduardo Silva <edsiper@gmail.com>
+	2008, One Laptop Per Child
 License: LGPL-2+
 
-Files: src/sugar/egg*
-Copyright: © 2007 Novell, Inc.
+Files: src/sugar/graphics/menuitem.py
+Copyright: 2007, Eduardo Silva <edsiper@gmail.com>
 License: LGPL-2+
 
-Files: src/sugar/eggdesktopfile.c
-Copyright: © 2007 Novell, Inc.
-	   partly © 1999, 2000 Red Hat Inc.
-	   partly © 2001 George Lebl
+Files: src/sugar/activity/registry.py
+Copyright: 2007, One Laptop Per Child
+	2006-2007, Red Hat, Inc
 License: LGPL-2+
 
-Files: src/sugar/eggsmclient-xsmp.c
-Copyright: © 2007 Novell, Inc.
-	   partly © 1998 Carsten Schaar
-	   partly © 1998 The Open Group
-License: LGPL-2+
-
-Files: src/sugar/activity/*, src/sugar/env.py,
- src/sugar/graphics/icon.py, src/sugar/graphics/roundbox.py,
- src/sugar/graphics/xocolor.py, src/sugar/network.py,
- src/sugar/sugar-address-entry.[ch], src/sugar/util.py,
- src/sugar/_sugarextmodule.c, src/sugar/bundle/__init__.py,
- src/sugar/graphics/__init__.py, src/sugar/presence/__init__.py,
- src/sugar/profile.py, src/sugar/sugar-key-grabber.[ch],
- src/sugar/sugar-menu.[ch]
-Copyright: © 2006-2007, Red Hat, Inc.
-License: GPL-2+
+Files: src/sugar/graphics/radiotoolbutton.py
+Copyright: 2007, Red Hat, Inc
+	2007-2008, One Laptop Per Child
+License: LGPL-2+
 
-Files: src/sugar/gsm-*
-Copyright: © 2007 Novell, Inc
-License: GPL-2+
+Files: src/sugar/graphics/toolbutton.py
+Copyright: 2007, Red Hat, Inc
+	2008, One Laptop Per Child
+License: LGPL-2+
 
-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: other
- 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: src/sugar/presence/tubeconn.py
+Copyright: 2007, Collabora Ltd. <http://www.collabora.co.uk/>
+License: LGPL-2.1+
 
-Files: m4/intltool.m4
-Copyright: © 2001 Eazel, Inc.
-License: GPL-2+ | other
- 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.
- .
- 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: src/sugar/presence/sugartubeconn.py
+Copyright: 2008, One Laptop Per Child
+License: LGPL-2.1+
 
-Files: install-sh
-Copyright: © 1994 X Consortium
+Files: ./install-sh
+Copyright: 1994, X Consortium
 License: other
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to
@@ -160,25 +216,60 @@ License: other
  .
  FSF changes to this file are in the public domain.
 
+Files: ./configure
+Copyright: 1992-1996, 1998-2006, Free Software Foundation, Inc.
+License: GAP
+
+Files: ./aclocal.m4
+Copyright: 1994-2005, Free Software Foundation, Inc.
+License: GAP
+
+Files: po/Makefile.in.in
+Copyright: 1995-1997, Ulrich Drepper <drepper@gnu.ai.mit.edu>
+	2004-2008, Rodney Dawes <dobey.pwns@gmail.com>
+License: PD
+ 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: src/sugar/gsm-app.h
+Copyright: 2006, Novell, Inc
+License: UNKNOWN
+
 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.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in file "/usr/share/common-licenses/GPL".
 
 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.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in file "/usr/share/common-licenses/LGPL".
 
 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
  by the Free Software Foundation; either version 2.1 of the License, or
  (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in file "/usr/share/common-licenses/LGPL".
+
+License: other-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.
 
-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"..
+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.
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 46c81fb..330b765 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,4 +1,90 @@
-*No copyright* UNKNOWN []: AUTHORS
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX
+Upstream-Name: Untrusted draft - double-check copyrights yourself!
+
+Files: po/af.po
+	po/am.po
+	po/ar.po
+	po/ay.po
+	po/bg.po
+	po/bn.po
+	po/bn_IN.po
+	po/ca.po
+	po/de.po
+	po/dz.po
+	po/el.po
+	po/en.po
+	po/es.po
+	po/fa.po
+	po/fa_AF.po
+	po/ff.po
+	po/fr.po
+	po/gu.po
+	po/ha.po
+	po/hi.po
+	po/ht.po
+	po/ig.po
+	po/is.po
+	po/it.po
+	po/ja.po
+	po/km.po
+	po/ko.po
+	po/mk.po
+	po/ml.po
+	po/mn.po
+	po/mr.po
+	po/mvo.po
+	po/ne.po
+	po/nl.po
+	po/pa.po
+	po/pap.po
+	po/pis.po
+	po/pl.po
+	po/ps.po
+	po/pt.po
+	po/pt_BR.po
+	po/qu.po
+	po/ro.po
+	po/ru.po
+	po/rw.po
+	po/sd.po
+	po/si.po
+	po/te.po
+	po/th.po
+	po/tpi.po
+	po/tr.po
+	po/ur.po
+	po/vi.po
+	po/yo.po
+	po/zh_CN.po
+	po/zh_TW.po
+Copyright: YEAR THE PACKAGE'S HOLDER
+License: UNKNOWN
+
+Files: src/sugar/_sugarextmodule.c
+	src/sugar/activity/__init__.py
+	src/sugar/activity/activityfactory.py
+	src/sugar/activity/activityhandle.py
+	src/sugar/activity/activityservice.py
+	src/sugar/bundle/__init__.py
+	src/sugar/env.py
+	src/sugar/graphics/__init__.py
+	src/sugar/graphics/icon.py
+	src/sugar/graphics/roundbox.py
+	src/sugar/graphics/xocolor.py
+	src/sugar/network.py
+	src/sugar/presence/__init__.py
+	src/sugar/profile.py
+	src/sugar/sugar-address-entry.c
+	src/sugar/sugar-address-entry.h
+	src/sugar/sugar-key-grabber.c
+	src/sugar/sugar-key-grabber.h
+	src/sugar/sugar-menu.c
+	src/sugar/sugar-menu.h
+	src/sugar/util.py
+Copyright: 2006-2007, Red Hat, Inc
+License: LGPL-2+
+
+Files: AUTHORS
 	Makefile.am
 	README
 	configure.ac
@@ -19,11 +105,15 @@
 	src/sugar/sugar-marshal.c
 	src/sugar/sugar-marshal.h
 	src/sugar/sugar-marshal.list
-LGPL-2+ [2007, Red Hat, Inc]: src/sugar/bundle/activitybundle.py
+Copyright: *No copyright*
+License: UNKNOWN
+
+Files: src/sugar/bundle/activitybundle.py
 	src/sugar/bundle/bundle.py
 	src/sugar/bundle/contentbundle.py
 	src/sugar/graphics/animator.py
 	src/sugar/graphics/entry.py
+	src/sugar/graphics/palettegroup.py
 	src/sugar/graphics/panel.py
 	src/sugar/graphics/style.py
 	src/sugar/graphics/toggletoolbutton.py
@@ -36,37 +126,10 @@ LGPL-2+ [2007, Red Hat, Inc]: src/sugar/bundle/activitybundle.py
 	src/sugar/sugar-preview.c
 	src/sugar/sugar-preview.h
 	src/sugar/wm.py
-LGPL-2+ [2006-2007 Red Hat, Inc]: src/sugar/activity/activityfactory.py
-	src/sugar/activity/activityhandle.py
-	src/sugar/activity/activityservice.py
-	src/sugar/env.py
-	src/sugar/graphics/icon.py
-	src/sugar/graphics/roundbox.py
-	src/sugar/graphics/xocolor.py
-	src/sugar/network.py
-	src/sugar/sugar-address-entry.c
-	src/sugar/sugar-address-entry.h
-	src/sugar/util.py
-LGPL-2+ [2006-2007, Red Hat, Inc]: src/sugar/_sugarextmodule.c
-	src/sugar/activity/__init__.py
-	src/sugar/bundle/__init__.py
-	src/sugar/graphics/__init__.py
-	src/sugar/presence/__init__.py
-	src/sugar/profile.py
-	src/sugar/sugar-key-grabber.c
-	src/sugar/sugar-key-grabber.h
-	src/sugar/sugar-menu.c
-	src/sugar/sugar-menu.h
-GENERATED FILE [1994-2002]: Makefile.in
-	src/Makefile.in
-	src/sugar/Makefile.in
-	src/sugar/activity/Makefile.in
-	src/sugar/bundle/Makefile.in
-	src/sugar/clipboard/Makefile.in
-	src/sugar/datastore/Makefile.in
-	src/sugar/graphics/Makefile.in
-	src/sugar/presence/Makefile.in
-GPL-2+ [2007 Novell, Inc]: src/sugar/gsm-app.c
+Copyright: 2007, Red Hat, Inc
+License: LGPL-2+
+
+Files: src/sugar/gsm-app.c
 	src/sugar/gsm-client-xsmp.c
 	src/sugar/gsm-client-xsmp.h
 	src/sugar/gsm-client.c
@@ -75,7 +138,10 @@ GPL-2+ [2007 Novell, Inc]: src/sugar/gsm-app.c
 	src/sugar/gsm-session.h
 	src/sugar/gsm-xsmp.c
 	src/sugar/gsm-xsmp.h
-LGPL-2+ [2007, One Laptop Per Child]: src/sugar/clipboard/__init__.py
+Copyright: 2007, Novell, Inc
+License: GPL-2+
+
+Files: src/sugar/clipboard/__init__.py
 	src/sugar/clipboard/clipboardservice.py
 	src/sugar/datastore/__init__.py
 	src/sugar/datastore/datastore.py
@@ -84,41 +150,167 @@ LGPL-2+ [2007, One Laptop Per Child]: src/sugar/clipboard/__init__.py
 	src/sugar/graphics/iconentry.py
 	src/sugar/graphics/objectchooser.py
 	src/sugar/graphics/tray.py
-LGPL-2+ [2007 Novell, Inc]: src/sugar/eggdesktopfile.h
+Copyright: 2007, One Laptop Per Child
+License: LGPL-2+
+
+Files: Makefile.in
+	src/Makefile.in
+	src/sugar/Makefile.in
+	src/sugar/activity/Makefile.in
+	src/sugar/bundle/Makefile.in
+	src/sugar/clipboard/Makefile.in
+	src/sugar/datastore/Makefile.in
+	src/sugar/graphics/Makefile.in
+	src/sugar/presence/Makefile.in
+Copyright: 1994-2002
+License: UNKNOWN (GENERATED FILE)
+
+Files: src/sugar/eggdesktopfile.h
 	src/sugar/eggsmclient-private.h
 	src/sugar/eggsmclient.c
 	src/sugar/eggsmclient.h
-LGPL-2+ [2004-2006 Christian Hammond]: src/sugar/sexy-icon-entry.c
+Copyright: 2007, Novell, Inc
+License: LGPL-2+
+
+Files: compile
+	depcomp
+Copyright: 1999-2000, 2003-2005, Free Software Foundation, Inc
+License: GPL (GENERATED FILE)
+
+Files: src/sugar/sexy-icon-entry.c
 	src/sugar/sexy-icon-entry.h
-*No copyright* GENERATED FILE []: src/sugar/_sugarext.c
-GENERATED FILE [1992-1996, 1998-2001]: configure
-GENERATED FILE [1995-2002 Free Software Foundation, Inc / 2001-2004 Red Hat, Inc / 1996-2004]: aclocal.m4
-GPL GENERATED FILE [1996-1997, 1999-2000, 2002-2006]: missing
-GPL GENERATED FILE [1999-2000, 2003-2007 Free Software]: depcomp
-GPL GENERATED FILE [2000-2001 Eazel, Inc / 2000, 2003 Free Software Foundation]: intltool-merge.in
-GPL GENERATED FILE [2000-2001, 2003-2005 Free Software Foundation, Inc]: py-compile
-GPL GENERATED FILE [2000-2003 Free Software Foundation]: intltool-update.in
-GPL-2+ GENERATED FILE [1996-2001, 2003-2006]: ltmain.sh
-GPL-2+ GENERATED FILE [2000-2001, 2003 Free Software Foundation]: intltool-extract.in
-GPL-2+ GENERATED FILE [2001 Eazel, Inc]: m4/intltool.m4
-LGPL-2+ [1998 Carsten Schaar, and twm / 1998 The Open Group / 2007 Novell, Inc]: src/sugar/eggsmclient-xsmp.c
-LGPL-2+ [1999-2000 Red Hat Inc / 2001 George Lebl / 2007 Novell, Inc]: src/sugar/eggdesktopfile.c
-LGPL-2+ [2002 Red Hat, Inc.; 1998, 2001 Tim Janik]: src/sugar/eggaccelerators.c
-LGPL-2+ [2002 Red Hat, Inc]: src/sugar/eggaccelerators.h
-LGPL-2+ [2006-2007 Red Hat, Inc / 2007, One Laptop Per Child]: src/sugar/datastore/dbus_helpers.py
-LGPL-2+ [2006-2007 Red Hat, Inc / 2007-2008 One Laptop Per Child]: src/sugar/activity/activity.py
-LGPL-2+ [2007 One Laptop Per Child / 2006-2007 Red Hat, Inc]: src/sugar/activity/registry.py
-LGPL-2+ [2007 Red Hat, Inc]: src/sugar/graphics/palettegroup.py
-LGPL-2+ [2007, Eduardo Silva (edsiper@gmail.com)]: src/sugar/graphics/notebook.py
-LGPL-2+ [2007, Eduardo Silva <edsiper@gmail.com> / 2008, One Laptop Per Child]: src/sugar/graphics/palette.py
-LGPL-2+ [2007, Eduardo Silva <edsiper@gmail.com>]: src/sugar/graphics/menuitem.py
-LGPL-2+ [2007, Red Hat, Inc / 2007-2008, One Laptop Per Child]: src/sugar/graphics/radiotoolbutton.py
-LGPL-2+ [2007, Red Hat, Inc / 2008, One Laptop Per Child]: src/sugar/graphics/toolbutton.py
-LGPL-2+ [2008 Red Hat, Inc]: src/sugar/activity/bundlebuilder.py
-LGPL-2+ [2008, Red Hat, Inc]: src/sugar/session.py
-LGPL-2.1+ [2007 Collabora Ltd. <http://www.collabora.co.uk/>]: src/sugar/presence/tubeconn.py
-LGPL-2.1+ [2008 One Laptop Per Child]: src/sugar/presence/sugartubeconn.py
-MIT/X11 (BSD like) [1994 X Consortium]: install-sh
-UNKNOWN [1995-1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> / 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>]: po/Makefile.in.in
-UNKNOWN [2006 Novell, Inc]: src/sugar/gsm-app.h
-UNKNOWN [the / 1991, 1999 Free Software Foundation, Inc]: COPYING
+Copyright: 2004-2006, Christian Hammond
+License: LGPL-2+
+
+Files: src/sugar/activity/bundlebuilder.py
+	src/sugar/session.py
+Copyright: 2008, Red Hat, Inc
+License: LGPL-2+
+
+Files: missing
+Copyright: 1996-1997, 1999-2000, 2002-2005
+License: GPL (GENERATED FILE)
+
+Files: py-compile
+Copyright: 2000-2001, 2003-2005, Free Software Foundation, Inc
+License: GPL (GENERATED FILE)
+
+Files: intltool-merge.in
+Copyright: 2000-2001, Eazel, Inc
+	2000, 2003, Free Software Foundation
+License: GPL (GENERATED FILE)
+
+Files: intltool-update.in
+Copyright: 2000-2003, Free Software Foundation
+License: GPL (GENERATED FILE)
+
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2006
+License: GPL-2+ (GENERATED FILE)
+
+Files: intltool-extract.in
+Copyright: 2000-2001, 2003, Free Software Foundation
+License: GPL-2+ (GENERATED FILE)
+
+Files: m4/intltool.m4
+Copyright: 2001, Eazel, Inc
+License: GPL-2+ (GENERATED FILE)
+
+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/eggdesktopfile.c
+Copyright: 1999-2000, Red Hat Inc
+	2001, George Lebl
+	2007, Novell, Inc
+License: LGPL-2+
+
+Files: src/sugar/eggaccelerators.c
+Copyright: 2002, Red Hat, Inc.; 1998, 2001, Tim Janik
+License: LGPL-2+
+
+Files: src/sugar/eggaccelerators.h
+Copyright: 2002, Red Hat, Inc
+License: LGPL-2+
+
+Files: src/sugar/datastore/dbus_helpers.py
+Copyright: 2006-2007, Red Hat, Inc
+	2007, One Laptop Per Child
+License: LGPL-2+
+
+Files: src/sugar/activity/activity.py
+Copyright: 2006-2007, Red Hat, Inc
+	2007-2008, One Laptop Per Child
+License: LGPL-2+
+
+Files: src/sugar/graphics/notebook.py
+Copyright: 2007, Eduardo Silva (edsiper@gmail.com)
+License: LGPL-2+
+
+Files: src/sugar/graphics/palette.py
+Copyright: 2007, Eduardo Silva <edsiper@gmail.com>
+	2008, One Laptop Per Child
+License: LGPL-2+
+
+Files: src/sugar/graphics/menuitem.py
+Copyright: 2007, Eduardo Silva <edsiper@gmail.com>
+License: LGPL-2+
+
+Files: src/sugar/activity/registry.py
+Copyright: 2007, One Laptop Per Child
+	2006-2007, Red Hat, Inc
+License: LGPL-2+
+
+Files: src/sugar/graphics/radiotoolbutton.py
+Copyright: 2007, Red Hat, Inc
+	2007-2008, One Laptop Per Child
+License: LGPL-2+
+
+Files: src/sugar/graphics/toolbutton.py
+Copyright: 2007, Red Hat, Inc
+	2008, One Laptop Per Child
+License: LGPL-2+
+
+Files: src/sugar/presence/tubeconn.py
+Copyright: 2007, Collabora Ltd. <http://www.collabora.co.uk/>
+License: LGPL-2.1+
+
+Files: src/sugar/presence/sugartubeconn.py
+Copyright: 2008, One Laptop Per Child
+License: LGPL-2.1+
+
+Files: install-sh
+Copyright: 1994, X Consortium
+License: MIT/X11 (BSD like)
+
+Files: src/sugar/_sugarext.c
+Copyright: *No copyright*
+License: UNKNOWN (GENERATED FILE)
+
+Files: configure
+Copyright: 1992-1996, 1998-2001
+License: UNKNOWN (GENERATED FILE)
+
+Files: aclocal.m4
+Copyright: 1995-2002, Free Software Foundation, Inc
+	2001-2004, Red Hat, Inc
+	1996-2004
+License: UNKNOWN (GENERATED FILE)
+
+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: UNKNOWN
+
+Files: src/sugar/gsm-app.h
+Copyright: 2006, Novell, Inc
+License: UNKNOWN
+
+Files: COPYING
+Copyright: the
+	1991, 1999, Free Software Foundation, Inc
+License: UNKNOWN
+