[SCM] morituri/master: Update copyright file: Bump format to draft 174 of DEP-5. Quote license names in License field comments, and rewrap at 72 chars.

Sun Jun 5 17:35:20 UTC 2011

The following commit has been merged in the master branch:
commit 4064e75884f6423f69fd24f14581888efc7ca2cb
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 5 18:57:59 2011 +0200

    Update copyright file: Bump format to draft 174 of DEP-5. Quote license names in License field comments, and rewrap at 72 chars.

diff --git a/debian/copyright b/debian/copyright
index 5f9e32d..48cc45d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,76 +1,73 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: Morituri
-Maintainer: Thomas Vander Stichele <thomas at apestaart.org>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Upstream-Name: Morituri
+Upstream-Contact: Thomas Vander Stichele <thomas at apestaart.org>
 Source: http://thomas.apestaart.org/download/morituri/
 
 Copyright: 2009, Thomas Vander Stichele <thomas at apestaart.org>
 License: GPL-3+
 
-Files: Makefile.in
+Files: */Makefile.in
 Copyright: 1994-2008, Free Software Foundation, Inc.
-License: other-GAP
- 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: GAP~Makefile.in
 
-Files: ./missing
-	./py-compile
+Files: missing
+ py-compile
 Copyright: 1996-1997, 1999-2006, Free Software Foundation, Inc.
-License: GPL-2+ or other-Autoconf
+License: GPL-2+ with Autoconf exception
+ 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: ./install-sh
+Files: install-sh
 Copyright: 1994, X Consortium
-License: Expat or other-X
+License: Expat~X with X exception
+ 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.
 
-Files: ./configure
+Files: configure
 Copyright: 1992-1996, 1998-2008, Free Software Foundation, Inc.
-License: other-GAP-FSF
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
+License: GAP~configure
 
-Files: ./po/Makefile.in.in
+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: other-GAP-Makefile.in.in
- 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.
+License: GAP~Makefile.in.in
 
-Files: ./aclocal.m4
+Files: aclocal.m4
 Copyright: 1995-2008, Free Software Foundation, Inc
 	2001-2004, Red Hat, Inc
-License: other-GAP-FSF-notice
- 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: GAP
 
-Files: ./morituri/extern/command/test_command.py
+Files: morituri/extern/command/test_command.py
 Copyright: 2006-2007, Thomas Vander Stichele <thomas at apestaart.org>
 License: GPL-2+
 
-Files: ./morituri/extern/log/test_log.py
+Files: morituri/extern/log/test_log.py
 Copyright: 2004-2007, Fluendo, S.L. <http://www.fluendo.com/>
-License: GPL-2 or other-Fluendo
+License: GPL-2 or Fluendo
 
-Files: ./debian/*
+Files: debian/*
 Copyright: 2009-2010, Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
 
 License: GPL-3+
- morituri 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 3 of the License, or
- (at your option) any later version.
- .
- morituri 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.
+ morituri 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 3 of the License, or (at your
+ option) any later version.
  .
- On Debian systems, the complete text of the GNU General Public License
- (GPL) version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ morituri 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.
+Comment:
+ On Debian systems the 'GNU General Public License' version 3 is located
+ in '/usr/share/common-licenses/GPL-3'.
  .
- You should have received a copy of the GNU General Public License
+ 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: GPL-2+
@@ -83,63 +80,68 @@ License: GPL-2+
  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.
- .
- On Debian systems, the complete text of the GNU General Public License
- (GPL) version 2 can be found in "/usr/share/common-licenses/GPL-2".
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Comment:
+ On Debian systems the 'GNU General Public License' version 2 is located
+ in '/usr/share/common-licenses/GPL-2'.
 
 License: GPL-2
- This file may be distributed and/or modified under the terms of
- the GNU General Public License version 2 as published by
- the Free Software Foundation.
+ This file may be distributed and/or modified under the terms of the GNU
+ General Public License version 2 as published by the Free Software
+ Foundation.
+ .
  This file is distributed without any warranty; without even the implied
  warranty of merchantability or fitness for a particular purpose.
- See "LICENSE.GPL" in the source distribution for more information.
  .
+ See "LICENSE.GPL" in the source distribution for more information.
+Comment:
  The referenced file LICENSE.GPL do not exist in upstream source.
- .
- On Debian systems, the complete text of the GNU General Public License
- (GPL) version 2 can be found in "/usr/share/common-licenses/GPL-2".
- .
- 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: Expat
- 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:
+License: Expat~X
+ 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.
-
-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.
-
-License: other-X
- 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.
-
-License: other-Fluendo
+ 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.
+
+License: Fluendo
  Licensees having purchased or holding a valid Flumotion Advanced
  Streaming Server license may use this file in accordance with the
  Flumotion Advanced Streaming Server Commercial License Agreement.
- See "LICENSE.Flumotion" in the source distribution for more information.
  .
+ See "LICENSE.Flumotion" in the source distribution for more
+ information.
+Comment:
  The referenced file LICENSE.Flumotion do not exist in upstream source.
+
+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.
+
+License: GAP~configure
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+
+License: 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: GAP~Makefile.in.in
+ 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.

-- 
morituri packaging

