[Pkg-sugar-commit] [sugar-presence-service] 06/07: Reformat debian/copyright to conform to draft DEP5 rev. 135. Add GPL disclaimers. Adjust years for debian/*.

Mon Apr 20 13:36:09 UTC 2015

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

js pushed a commit to annotated tag debian/0.84.0-6
in repository sugar-presence-service.

commit d5f95a0cc2a11f98f9e93923b0170911b4a47bd9
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Mar 30 19:33:59 2010 +0200

    Reformat debian/copyright to conform to draft DEP5 rev. 135. Add GPL disclaimers. Adjust years for debian/*.
---
 debian/copyright | 123 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 62 insertions(+), 61 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index b09d233..b8ef8bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=54
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
 Name: sugar-presence-service
-Contact: Sugarlabs <sugar-devel at lists.sugarlabs.org>
+Maintainer: Sugarlabs <sugar-devel at lists.sugarlabs.org>
 	http://lists.sugarlabs.org/listinfo/sugar-devel
 	irc://irc.freenode.net/sugar
 Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/
@@ -12,27 +12,27 @@ License: GPL-2+
 
 Files: Makefile.in
 Copyright: 1994-2009, Free Software Foundation, Inc.
-License: other-GAP-Makefile.in
+License: other-GAP-FSF
 
-Files: ./missing
+Files: ./missing,
 	./py-compile
 Copyright: 1996-1997,1999-2006, Free Software Foundation, Inc.
-License: GPL-2+ or other-Autoconf
+License: GPL-2+ or other-SA-Autoconf
 
-Files: src/sugar-presence-service.in
-	src/main.py
+Files: ./src/sugar-presence-service.in,
+	./src/main.py
 Copyright: 2006,2008, Red Hat, Inc.
 License: GPL-2+
 
-Files: src/psutils.py
+Files: ./src/psutils.py
 Copyright: 2007, Red Hat, Inc
 	2007, Collabora Ltd. <http://www.collabora.co.uk/>
 	2008, One Laptop Per Child
 License: GPL-2+
 
-Files: install-sh
+Files: ./install-sh
 Copyright: 1994, X Consortium
-License: other-MIT
+License: MIT
 
 Files: ./configure
 Copyright: 1992-1996,1998-2008, Free Software Foundation, Inc.
@@ -40,68 +40,69 @@ License: other-GAP-configure
 
 Files: ./aclocal.m4
 Copyright: 1996-2009, Free Software Foundation, Inc.
-License: other-GAP
+License: other-GAP-FSF
 
-Files: debian/*
-Copyright: 2004-2009, Jonas Smedegaard <dr at jones.dk>
+Files: ./debian/*
+Copyright: 2008-2010, Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
 
-Files: debian/cdbs/1/class/autotools*
-	debian/cdbs/1/class/makefile*
-Copyright: 2002-2003, Colin Walters <walters at debian.org>
-	2008, Jonas Smedegaard <dr at 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.
- .
- On Debian GNU systems, the complete text of GNU General Public License
- (GPL) version 2 can be found at "/usr/share/common-licenses/GPL-2".
-
-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
-  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.
+ 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.
  .
-  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.
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
  .
-  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.
+ On Debian systems, the complete text of a recent version of the GNU
+ General Public License (GPL) can be found in the file
+ "/usr/share/common-licenses/GPL".
  .
-  FSF changes to this file are in the public domain.
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-License: other-GAP-Makefile.in
- 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.
-
-License: other-Autoconf
+License: other-SA-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.
+ 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.
+
+License: other-GAP-FSF
+ 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.
+ .
+ Some files differ from above by using "This Makefile.in" instead of
+ "This file", but otherwise identical license and disclaimer.
 
 License: other-GAP-configure
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
 
-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.
+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 CONNECTION 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 dealings in this Software without prior written authorization
+ from the X Consortium.

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

