[Pkg-sugar-commit] [sugar-toolkit] 11/118: Rewrite copyright to use DEP5 r48 proposed machine-readable format.

[Jonas Smedegaard]

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

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

commit febcbb34885b25999c5262cadc4ee7a8780d777d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri May 29 15:25:43 2009 +0200

    Rewrite copyright to use DEP5 r48 proposed machine-readable format.
---
 debian/copyright | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a11dddf..8932646 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,10 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=420
-Upstream-Name: sugar-toolkit
-Upstream-Maintainer: sugar-devel at lists.sugarlabs.org
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=48
+Name: sugar-toolkit
+Maintainer: sugar-devel at lists.sugarlabs.org
 	irc://irc.freenode.net/sugar
-Upstream-Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/
+Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/
 	git://git.sugarlabs.org/sugar-toolkit/mainline
 
-Files: *
 Copyright: 2002,2006-2008, Red Hat, Inc
 License: LGPL-2+
 
@@ -32,7 +31,7 @@ License: LGPL-2+
 Files: Makefile.in
 	./configure
 Copyright: 1992-2008, Free Software Foundation, Inc.
-License: GAP
+License: other-GAP
 
 Files: src/sugar/acme-*
 Copyright: 2002-2003, Bastien Nocera
@@ -50,7 +49,7 @@ License: LGPL-2+
 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+ | other-Autoconf
+License: GPL-2+ or other-Autoconf
 
 Files: ./depcomp
 	./config.guess
@@ -58,16 +57,16 @@ Files: ./depcomp
 	./ltmain.sh
 	./py-compile
 Copyright: 1999-2008, Free Software Foundation, Inc.
-License: GPL-2+ | other-Autoconf
+License: GPL-2+ or other-Autoconf
 
 Files: m4/intltool.m4
 Copyright: 2001, Eazel, Inc
-License: GPL-2+ | other-Autoconf
+License: GPL-2+ or other-Autoconf
 
 Files: ./ltmain.sh
 	m4/libtool.m4
 Copyright: 1996-2001,2003-2008, Free Software Foundation, Inc.
-License: GPL-2+ | other-Libtool
+License: GPL-2+ or other-Libtool
 
 Files: src/sugar/eggsmclient-xsmp.c
 Copyright: 1998, Carsten Schaar, and twm
@@ -124,7 +123,7 @@ License: LGPL-2.1+
 
 Files: ./install-sh
 Copyright: 1994, X Consortium
-License: other
+License: other-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
@@ -152,7 +151,7 @@ License: other
 Files: aclocal.m4
 Copyright: 1994-2008, Free Software Foundation, Inc.
 	2001-2004, Red Hat, Inc
-License: GPL-2+ | other-Autoconf
+License: GPL-2+ or other-Autoconf
  Some parts of the file is not copyright protected, some parts are
  licensed as Public Domain (PD), but one part has the more restrictive
  licensing terms of GPLv2+ or the license of a surrounding
@@ -161,7 +160,7 @@ License: GPL-2+ | other-Autoconf
 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: PD
+License: other-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.
@@ -191,7 +190,7 @@ License: LGPL-2.1+
  License (LGPL) version 2.1 can be found at
  "/usr/share/common-licenses/LGPL".
 
-License: GAP
+License: other-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.

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