Update debian/copyright.

* Mention new file src/sugar/presence/sugartubeconn.py in
  debian/copyright (LGPL-2.1+) and update paths, thanks to local
  copyright-check.mk cdbs snippet. Update debian/copyright-hints.
* Rewrite debian/copyright to only mention each licensing string once.

3 files changed, 133 insertions, 160 deletions

diff --git a/debian/changelog b/debian/changelog
index 297224a..2a881c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 sugar-toolkit (0.79.7-1) unstable; urgency=low
 
   * New upstream release.
+  * Mention new file src/sugar/presence/sugartubeconn.py in
+    debian/copyright (LGPL-2.1+) and update paths, thanks to local
+    copyright-check.mk cdbs snippet. Update debian/copyright-hints.
+  * Rewrite debian/copyright to only mention each licensing string once.
 
  -- Jonas Smedegaard <dr@jones.dk>  Sat, 24 May 2008 21:51:37 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 583aaca..8eaa885 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,120 +9,71 @@ Upstream author: Red Hat, Inc.
 Files: debian/*
 Copyright: © 2008 Jonas Smedegaard <dr@jones.dk>
 License: GPL-2+
- The Debian packaging information is under the GPL, version 2 or later.
 
 Files: sugar/bundle/*, sugar/graphics/*, sugar/presence/*,
  sugar/sugar-preview.[ch], sugar/wm.py
 Copyright: © 2007, Red Hat, Inc.
 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.
 
 Files: sugar/graphics/palettegroup.py
 Copyright: © 2006-2007, Red Hat, Inc.
 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.
 
 Files: sugar/graphics/toolbutton.py
 Copyright: © 2008, One Laptop Per Child
 	   © 2007, Red Hat, Inc.
 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.
 
 Files: sugar/eggaccelerators.c
 Copyright: © 2002 Red Hat, Inc.
 	   © 1998, 2001 Tim Janik
 License: LGPL-2+
- This 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.
 
 Files: sugar/eggaccelerators.h
 Copyright: © 2002 Red Hat, Inc.
 License: LGPL-2+
- This 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.
 
 Files: sugar/clipboard/*, sugar/datastore/*, sugar/graphics/alert.py,
  sugar/graphics/combobox.py, sugar/graphics/iconentry.py,
  sugar/graphics/objectchooser.py, sugar/graphics/tray.py
 Copyright: © 2007, One Laptop Per Child
 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.
 
 Files: sugar/graphics/radiotoolbutton.py
 Copyright: © 2007-2008, One Laptop Per Child
 	   © 2007 Red Hat, Inc
 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.
 
 Files: sugar/activity/activity.py
 Copyright: © 2007-2008, One Laptop Per Child
 	   © 2006-2007 Red Hat, Inc
 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.
 
 Files: sugar/datastore/dbus_helpers.py, sugar/activity/registry.py
 Copyright: © 2007, One Laptop Per Child
 	   © 2006-2007 Red Hat, Inc
 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.
+
+Files: src/sugar/presence/sugartubeconn.py
+Copyright: © 2008, One Laptop Per Child
+License: LGPL-2.1+
 
 Files: sugar/presence/tubeconn.py
 Copyright: © 2007 Collabora Ltd. <http://www.collabora.co.uk/>
 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.
 
 Files: sugar/sexy-icon-entry.c, sugar/sexy-icon-entry.h
 Copyright: © 2004-2006 Christian Hammond
 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.
 
 Files: sugar/graphics/menuitem.py, sugar/graphics/notebook.py
 Copyright: © 2007, Eduardo Silva <edsiper@gmail.com>
 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.
 
 Files: sugar/graphics/palette.py
 Copyright: © 2008, One Laptop Per Child
 	   © 2007, Eduardo Silva <edsiper@gmail.com>
 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.
 
 Files: sugar/activity/*, sugar/env.py, sugar/graphics/icon.py,
  sugar/graphics/roundbox.py, sugar/graphics/xocolor.py,
@@ -132,10 +83,6 @@ Files: sugar/activity/*, sugar/env.py, sugar/graphics/icon.py,
  sugar/profile.py, sugar/sugar-key-grabber.[ch], sugar/sugar-menu.[ch]
 Copyright: © 2006-2007, Red Hat, Inc.
 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.
 
 Files: m4/intltool.m4
 Copyright: © 2001 Eazel, Inc.
@@ -153,29 +100,47 @@ License: GPL-2+ | other
 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
-  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:
+ 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 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.
+ 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.
+ 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.
  .
-  FSF changes to this file are in the public domain.
+ FSF changes to this file are in the public domain.
+
+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: 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 General Public License
 can be found in file "/usr/share/common-licenses/GPL", and the complete
diff --git a/debian/copyright_hints b/debian/copyright_hints
index cdd7d38..8067ff3 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -5,99 +5,103 @@
 	m4/python.m4
 	po/ChangeLog
 	po/POTFILES.in
-	sugar/Makefile.am
-	sugar/_sugarext.defs
-	sugar/_sugarext.override
-	sugar/activity/Makefile.am
-	sugar/bundle/Makefile.am
-	sugar/clipboard/Makefile.am
-	sugar/datastore/Makefile.am
-	sugar/graphics/Makefile.am
-	sugar/presence/Makefile.am
-	sugar/sugar-marshal.c
-	sugar/sugar-marshal.h
-	sugar/sugar-marshal.list
-LGPL-2+ [2007, Red Hat, Inc]: sugar/bundle/activitybundle.py
-	sugar/bundle/bundle.py
-	sugar/bundle/contentbundle.py
-	sugar/graphics/animator.py
-	sugar/graphics/entry.py
-	sugar/graphics/panel.py
-	sugar/graphics/style.py
-	sugar/graphics/toggletoolbutton.py
-	sugar/graphics/toolbox.py
-	sugar/graphics/toolcombobox.py
-	sugar/graphics/window.py
-	sugar/presence/activity.py
-	sugar/presence/buddy.py
-	sugar/presence/presenceservice.py
-	sugar/sugar-preview.c
-	sugar/sugar-preview.h
-	sugar/wm.py
-LGPL-2+ [2006-2007 Red Hat, Inc]: sugar/activity/activityfactory.py
-	sugar/activity/activityhandle.py
-	sugar/activity/activityservice.py
-	sugar/activity/bundlebuilder.py
-	sugar/env.py
-	sugar/graphics/icon.py
-	sugar/graphics/roundbox.py
-	sugar/graphics/xocolor.py
-	sugar/network.py
-	sugar/sugar-address-entry.c
-	sugar/sugar-address-entry.h
-	sugar/util.py
-LGPL-2+ [2006-2007, Red Hat, Inc]: sugar/_sugarextmodule.c
-	sugar/activity/__init__.py
-	sugar/bundle/__init__.py
-	sugar/graphics/__init__.py
-	sugar/presence/__init__.py
-	sugar/profile.py
-	sugar/sugar-key-grabber.c
-	sugar/sugar-key-grabber.h
-	sugar/sugar-menu.c
-	sugar/sugar-menu.h
-LGPL-2+ [2007, One Laptop Per Child]: sugar/clipboard/__init__.py
-	sugar/clipboard/clipboardservice.py
-	sugar/datastore/__init__.py
-	sugar/datastore/datastore.py
-	sugar/graphics/alert.py
-	sugar/graphics/combobox.py
-	sugar/graphics/iconentry.py
-	sugar/graphics/objectchooser.py
-	sugar/graphics/tray.py
+	src/Makefile.am
+	src/sugar/Makefile.am
+	src/sugar/_sugarext.defs
+	src/sugar/_sugarext.override
+	src/sugar/activity/Makefile.am
+	src/sugar/bundle/Makefile.am
+	src/sugar/clipboard/Makefile.am
+	src/sugar/datastore/Makefile.am
+	src/sugar/graphics/Makefile.am
+	src/sugar/presence/Makefile.am
+	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
+	src/sugar/bundle/bundle.py
+	src/sugar/bundle/contentbundle.py
+	src/sugar/graphics/animator.py
+	src/sugar/graphics/entry.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.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/activity/bundlebuilder.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
-	sugar/Makefile.in
-	sugar/activity/Makefile.in
-	sugar/bundle/Makefile.in
-	sugar/clipboard/Makefile.in
-	sugar/datastore/Makefile.in
-	sugar/graphics/Makefile.in
-	sugar/presence/Makefile.in
-LGPL-2+ [2004-2006 Christian Hammond]: sugar/sexy-icon-entry.c
-	sugar/sexy-icon-entry.h
-*No copyright* GENERATED FILE []: sugar/_sugarext.c
+	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
+LGPL-2+ [2007, One Laptop Per Child]: 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
+GPL GENERATED FILE [1999-2000, 2003-2005 Free Software Foundation, Inc]: compile
+	depcomp
+LGPL-2+ [2004-2006 Christian Hammond]: 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-2006 Free Software]: depcomp
+GPL GENERATED FILE [1996-1997, 1999-2000, 2002-2005]: missing
 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+ [2002 Red Hat, Inc.; Copyright 1998, 2001 Tim Janik]: sugar/eggaccelerators.c
-LGPL-2+ [2002 Red Hat, Inc]: sugar/eggaccelerators.h
-LGPL-2+ [2006-2007 Red Hat, Inc / 2007, One Laptop Per Child]: sugar/datastore/dbus_helpers.py
-LGPL-2+ [2006-2007 Red Hat, Inc / 2007-2008 One Laptop Per Child]: sugar/activity/activity.py
-LGPL-2+ [2007 One Laptop Per Child / 2006-2007 Red Hat, Inc]: sugar/activity/registry.py
-LGPL-2+ [2007 Red Hat, Inc]: sugar/graphics/palettegroup.py
-LGPL-2+ [2007, Eduardo Silva (edsiper@gmail.com)]: sugar/graphics/notebook.py
-LGPL-2+ [2007, Eduardo Silva <edsiper@gmail.com> / 2008, One Laptop Per Child]: sugar/graphics/palette.py
-LGPL-2+ [2007, Eduardo Silva <edsiper@gmail.com>]: sugar/graphics/menuitem.py
-LGPL-2+ [2007, Red Hat, Inc / 2007-2008, One Laptop Per Child]: sugar/graphics/radiotoolbutton.py
-LGPL-2+ [2007, Red Hat, Inc / 2008, One Laptop Per Child]: sugar/graphics/toolbutton.py
-LGPL-2.1+ [2007 Collabora Ltd. <http://www.collabora.co.uk/>]: sugar/presence/tubeconn.py
+LGPL-2+ [2002 Red Hat, Inc.; Copyright 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.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) [and license / notice and this permission notice shall be included in / 1994 X Consortium]: install-sh
 UNKNOWN [1995-1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>]: po/Makefile.in.in
 UNKNOWN [the / 1991, 1999 Free Software Foundation, Inc]: COPYING