[SCM] toonloop/master: Update copyright file: Fix include verbatim flavored Expat licensing, and rename its shortname accordingly.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5f3e2b6483d74b1a990d050b8b45691c4563a1a4
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Apr 6 17:22:25 2012 +0200

    Update copyright file: Fix include verbatim flavored Expat licensing, and rename its shortname accordingly.

diff --git a/debian/copyright b/debian/copyright
index 67e4296..2acde10 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -53,7 +53,7 @@ License: GAP and GPL-2+ with Autoconf exception
 
 Files: install-sh
 Copyright: 1994, X Consortium
-License: Expat with X exception
+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
@@ -117,7 +117,7 @@ Comment:
  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
+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
@@ -132,13 +132,10 @@ License: Expat
  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.
-Comment:
- Some files differ from above by replacing "The authors or copyright
- holders" with more specific term.
+ 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: GAP
  This file is free software; the Free Software Foundation gives

-- 
toonloop packaging