[SCM] liblrdf/master: Rewrite copyright file using draft svn166 of DEP5 format.

Sat Feb 26 13:50:15 UTC 2011

The following commit has been merged in the master branch:
commit 50b6151f33b52e8b7ce996b9f80364dcf1ea6021
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Feb 26 14:40:07 2011 +0100

    Rewrite copyright file using draft svn166 of DEP5 format.

diff --git a/debian/copyright b/debian/copyright
index 11b7560..d44ab98 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,160 +1,158 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: liblrdf
-Maintainer: Steve Harris <steve at plugin.org.uk>
-	Taybin Rutkin <taybin at earthlink.net>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=166
+Upstream-Name: liblrdf
+Upstream-Contact: Steve Harris <steve at plugin.org.uk>
+ Taybin Rutkin <taybin at earthlink.net>
 Source: http://sourceforge.net/projects/lrdf/
 
 Files: Makefile.in
 Copyright: 1994-2003, Free Software Foundation, Inc.
-License: other-GAP-Makefile.in
+License: GAP-Makefile.in
 
-Files: ./config.guess,
-	./config.sub
-	./depcomp,
-	./ltmain.sh,
-	./missing
+Files: config.guess
+ config.sub
+ depcomp
+ ltmain.sh
+ missing
 Copyright: 1992-2004, Free Software Foundation, Inc
-License: GPL-2+ and other-sa-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: ./src/lrdf_md5.h,
-	./src/md5.c
+Files: src/lrdf_md5.h
+ src/md5.c
 Copyright: 1995-1996, Free Software Foundation, Inc.
 License: GPL-2+
 
-Files: ./configure
+Files: configure
 Copyright: 1992-1996,1998-2003, Free Software Foundation, Inc.
-License: other-GAP-configure
+License: GAP-configure
 
-Files: ./aclocal.m4
+Files: aclocal.m4
 Copyright: 1995-2003, Free Software Foundation, Inc
-License: GPL-2+ and other-GAP-Makefile
+License: GPL-2+ and GAP-Makefile
 
-Files: ./src/ladspa.h
-Copyright: 2000-2002, Richard W.E. Furse
-	2000-2002, Paul Barton-Davis
-	2000-2002, Stefan Westerfeld
+Files: src/ladspa.h
+Copyright: 2000-2002, Paul Barton-Davis
+ 2000-2002, Richard W.E. Furse
+ 2000-2002, Stefan Westerfeld
 License: LGPL-2.1+
 
-Files: ./install-sh
+Files: install-sh
 Copyright: 1994, X Consortium
-License: Expat
+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: ./INSTALL
+Files: INSTALL
 Copyright: 1994-1996, 1999-2002, Free Software Foundation, Inc.
-License: other-GAP-INSTALL
+License: GAP
 
-Files: ./src/md5_loc.h
+Files: src/md5_loc.h
 Copyright: 1991-2, RSA Data Security, Inc. Created 1991. All
 License: other-RSA
 
-Files: ./debian/*
+Files: debian/*
 Copyright: 2003-2004, Robert Jordens <rjo at gmx.de>
 	2010, Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
 
 License: GPL-2+
  This file 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.
+ 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.
  .
  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.
+Comment:
+ On Debian systems the full text of the GNU General Public License (GPL)
+ version 2 can be found an "/usr/share/common-licenses/GPL-2".
  .
- On Debian systems, the complete text of the GNU General Public License
- (GPL) version 2 can be found an 2/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/>.
+ 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: LGPL-2.1+
- 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.1 of
- the License, or (at your option) any later version.
+ 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.1 of the License, or
+ (at your option) any later version.
  .
  This library 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
- Lesser General Public License for more details.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License (LGPL, formerly named GNU Library General Public
- License) version 2.1 can be found in
- '/usr/share/common-licenses/LGPL-2.1'.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
+ General Public License for more details.
+Comment:
+ On Debian systems the full text of the GNU Lesser General Public
+ License (LGPL, formerly named GNU Library General Public License)
+ version 2.1 can be found in '/usr/share/common-licenses/LGPL-2.1'.
  .
  You should have received a copy of the GNU Lesser General Public
  License along with this program.  If not, see
  <http://www.gnu.org/licenses/>.
 
-License: other-GAP-configure
+License: GAP-configure
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
 
-License: other-GAP-INSTALL
+License: GAP
  This file is free documentation; the Free Software Foundation gives
  unlimited permission to copy, distribute and modify it.
 
-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.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
-
-License: other-GAP-Makefile
- This file is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
-
-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.
-
-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: 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.
  .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
+
+License: GAP-Makefile
+ This file is free software; the Free Software Foundation gives
+ unlimited permission to copy and/or distribute it,
+
+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 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 above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of 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.
-
-License: other-RSA
+ 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: RSA
  License to copy and use this software is granted provided that it is
  identified as the "RSA Data Security, Inc. MD5 Message-Digest
- Algorithm" in all material mentioning or referencing this software
- or this function.
+ Algorithm" in all material mentioning or referencing this software or
+ this function.
  .
  License is also granted to make and use derivative works provided that
- such works are identified as "derived from the RSA Data Security,
- Inc. MD5 Message-Digest Algorithm" in all material mentioning or
- referencing the derived work.
+ such works are identified as "derived from the RSA Data Security, Inc.
+ MD5 Message-Digest Algorithm" in all material mentioning or referencing
+ the derived work.
  .
  RSA Data Security, Inc. makes no representations concerning either the
- merchantability of this software or the suitability of this
- software for any particular purpose. It is provided "as is" without
- express or implied warranty of any kind.
+ merchantability of this software or the suitability of this software
+ for any particular purpose. It is provided "as is" without express or
+ implied warranty of any kind.
  .
  These notices must be retained in any copies of any part of this
  documentation and/or software.

-- 
liblrdf packaging

