get closer to expectations/convention on copyright file

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
+ Permission is hereby granted, free of charge, to any person obtaining a
- obtaining a copy of this software and associated documentation
+ copy of this software and associated documentation files (the "Software"),
- files (the ``Software''), to deal in the Software without
+ to deal in the Software without restriction, including without limitation
- restriction, including without limitation the rights to use,
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
- copy, modify, merge, publish, distribute, sublicense, and/or
+ and/or sell copies of the Software, and to permit persons to whom the
- sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
- Software is furnished to do so, subject to the following
- conditions:
  .
- The above copyright notice and this permission notice shall be
+ The above copyright notice and this permission notice shall be included
- included in all copies or substantial portions of the Software.
+ in all copies or substantial portions of the Software.
  .
- Except as contained in this notice, the names of individuals
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- credited with contribution to this software shall not be used in
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- advertising or otherwise to promote the sale, use or other
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- dealings in this Software without prior written authorization
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- from the individuals in question.
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- .
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- Any stylesheet derived from this Software that is publically
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 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.
 
-License: GPL-2+
+License: GPL-2.0+
- This program is free software; you can redistribute it and/or modify
+ 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.,
+ along with this program. If not, see <http://www.gnu.org/licenses/>
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  .
- On Debian systems, the complete text of the GPL-2 can be found in
+ On Debian systems, the complete text of the GNU General
- /usr/share/common-licenses/GPL-2
+ 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
-