[SCM] pd-zexy/master: fixed licensing for install-sh and cosmetic changes

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 552cc38fbec153465a0cb5cc94842307d4ab3473
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Thu Sep 29 19:24:20 2011 +0200

    fixed licensing for install-sh and cosmetic changes
    
    try to linewrap at 72 characters
    remove trailing spaces
    changed license name of install-sh to 'Expat~X with X exception' as discussed on pkg-multimedia

diff --git a/debian/copyright b/debian/copyright
index f71b40a..3eb1bd3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,20 +31,25 @@ Files: ./src/absgn~.c
 Copyright: 2006, Tim Blechmann
 License: GPL-2+
 
-Files: config.guess config.sub depcomp libtool missing m4/libtool.m4 m4/lt~
+Files: config.guess config.sub depcomp libtool missing
+ m4/libtool.m4 m4/lt~obsolete.m4
 Copyright: 1996-2010, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: install-sh
 Copyright: 1994, X Consortium
  Public Domain
-License: MIT/X11 (BSD like)
+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: ./m4/ltoptions.m4 ./m4/ltsugar.m4 ./m4/ltversion.m4
 Copyright: 1996-2010, Free Software Foundation, Inc.
 License: other-GAP-FSF-Notice
 
-Files: ./configure 
+Files: ./configure
 Copyright: 1992-2010, Free Software Foundation, Inc
 License: other-GAP-FSF
 
@@ -84,7 +89,14 @@ License: other-GAP-FSF-Notice
 License: other-GAP-FSF
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
- 
+
+License: other-GAP-FSF-preserve
+ 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 to use, copy, modify, distribute, and distribute modified
  versions of this software and its documentation without fee and without
@@ -104,25 +116,22 @@ License: MIT
  TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
  MODIFICATIONS.
 
-License: MIT/X11 (BSD like)
- 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.
+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.
+ 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.

-- 
pd-zexy packaging