From a54d0ec47ed0bbaa598713389d1356a9ec2fa604 Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Fri, 22 Apr 2016 07:03:48 -0400 Subject: [PATCH] get closer to expectations/convention on copyright file --- debian/copyright | 66 +++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 43 deletions(-) diff --git a/debian/copyright b/debian/copyright index d19de6d..d1789a1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,7 @@ License: MIT Files: extras/dsssl/* extras/css/* Copyright: 2000-2003 - Greg Ferguson (gferg@metalab.unc.edu) -License: GPL-2+ +License: GPL-2.0+ Files: extras/dsssl/* extras/xsl/* extras/css/* Copyright: 2000-2002 - David Horton (dhorton@speakeasy.net) @@ -22,63 +22,43 @@ License: MIT Files: extras/collateindex.pl Copyright: 1997-2001 Norman Walsh License: MIT - - + 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: + 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. . - Except as contained in this notice, the names of individuals - credited with contribution to this software 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 individuals in question. - . - Any stylesheet derived from this Software that is publically - distributed will be identified with a different name and the - version strings in any derived Software will be changed so that - no possibility of confusion between the derived package and this - Software will exist. - . - Warranty - -------- - 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 NORMAN WALSH OR ANY OTHER - CONTRIBUTOR 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. + 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 AUTHORS OR COPYRIGHT HOLDERS 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: GPL-2+ - This program is free software; you can redistribute it and/or modify +License: GPL-2.0+ + This package 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. . - This program is distributed in the hope that it will be useful, + This package 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. . You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + along with this program. If not, see . - On Debian systems, the complete text of the GPL-2 can be found in - /usr/share/common-licenses/GPL-2 + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". License: GFDL-1.2 On Debian systems, the complete text of the GFDL-1.2 can be found in /usr/share/common-licenses/GFDL-1.2 -