r12272 - non-free/packages/trunk/assaultcube/debian

[Arand Nash]

Author: arand-guest
Date: 2011-05-08 23:26:20 +0000 (Sun, 08 May 2011)
New Revision: 12272

Modified:
   non-free/packages/trunk/assaultcube/debian/copyright
Log:
Include utf8 headers in copyright, rearrange

Modified: non-free/packages/trunk/assaultcube/debian/copyright
===================================================================
--- non-free/packages/trunk/assaultcube/debian/copyright	2011-05-08 23:25:44 UTC (rev 12271)
+++ non-free/packages/trunk/assaultcube/debian/copyright	2011-05-08 23:26:20 UTC (rev 12272)
@@ -55,23 +55,6 @@
 Files: source/enet/*
 Copyright: Copyright (c) 2002-2008 Lee Salzman
 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:
- .
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of 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.
 
 Files: src/enet/aclocal.m4
 Copyright: Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -264,10 +247,16 @@
  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  PARTICULAR PURPOSE.
 
+Files: source/include/*
+Copyright: Copyright 2006 Nemanja Trifunovic
+License: Expat
+
 Files debian/*
 Copyright: Copyright 2009 Gonéri Le Bouder
            Copyright 2011 Arand Nash
 License: Expat
+
+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