Update debian/copyright and copyright hints (new copyright holders and years, same licenses).

3 files changed, 57 insertions, 29 deletions

diff --git a/debian/changelog b/debian/changelog
index 5a3dadb..735b583 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 sugar-toolkit (0.82.11-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Update debian/copyright and copyright hints (new copyright holders
+    and years, same licenses).
 
  -- Jonas Smedegaard <dr@jones.dk>  Sun, 19 Oct 2008 11:10:44 +0200
 
diff --git a/debian/copyright b/debian/copyright
index f32d86f..4b22746 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -74,6 +74,21 @@ Files: Makefile.in, ./aclocal.m4
 Copyright: 1994-2005, Free Software Foundation, Inc.
 License: GAP
 
+Files: src/sugar/activity/bundlebuilder.py
+	src/sugar/activity/main.py
+	src/sugar/session.py
+	src/sugar/sugar-grid.c
+	src/sugar/sugar-grid.h
+Copyright: 2008, Red Hat, Inc
+License: LGPL-2+
+
+Files: src/sugar/acme-volume-alsa.c
+	src/sugar/acme-volume-alsa.h
+	src/sugar/acme-volume.c
+	src/sugar/acme-volume.h
+Copyright: 2002-2003, Bastien Nocera
+License: LGPL-2+
+
 Files: src/sugar/eggdesktopfile.h
 	src/sugar/eggsmclient-private.h
 	src/sugar/eggsmclient.[ch]
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 27122b3..f72843a 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -62,34 +62,11 @@ Files: po/af.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
+	m4/gnome-compiler-flags.m4
 	m4/python.m4
 	po/ChangeLog
 	po/POTFILES.in
@@ -110,6 +87,30 @@ Files: AUTHORS
 Copyright: *No copyright*
 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: src/sugar/bundle/activitybundle.py
 	src/sugar/bundle/bundle.py
 	src/sugar/bundle/contentbundle.py
@@ -167,6 +168,21 @@ Files: Makefile.in
 Copyright: 1994-2002
 License: UNKNOWN (GENERATED FILE)
 
+Files: src/sugar/activity/bundlebuilder.py
+	src/sugar/activity/main.py
+	src/sugar/session.py
+	src/sugar/sugar-grid.c
+	src/sugar/sugar-grid.h
+Copyright: 2008, Red Hat, Inc
+License: LGPL-2+
+
+Files: src/sugar/acme-volume-alsa.c
+	src/sugar/acme-volume-alsa.h
+	src/sugar/acme-volume.c
+	src/sugar/acme-volume.h
+Copyright: 2002-2003, Bastien Nocera
+License: LGPL-2+
+
 Files: src/sugar/eggdesktopfile.h
 	src/sugar/eggsmclient-private.h
 	src/sugar/eggsmclient.c
@@ -179,11 +195,6 @@ Files: src/sugar/sexy-icon-entry.c
 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-2006
 License: GPL (GENERATED FILE)