[sumo] 08/10: Fix lintian warnings in d/copyright.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch experimental
in repository sumo.

commit b0c3f6465903cb3bd762dd5ca2e522dc4a3d59a2
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Nov 20 22:01:56 2014 +0100

    Fix lintian warnings in d/copyright.
---
 debian/copyright | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 74c73fc..dce64e8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,10 +31,33 @@ License: LGPL-2.1+
 
 Files: ./src/foreign/tcpip/*
 Copyright: 2004-2007, the SwarmNet (www.swarmnet.de) project
-License: BSD like
+License: BSD-3-clause
  Shawn is free software; you can redistribute it and/or modify it
  under the terms of the BSD License. Refer to the shawn-licence.txt
  file in the root of the Shawn source tree for further details.
+ . 
+ Redistribution and use in source and binary forms, with or without 
+ modification, are permitted provided that the following conditions are met:
+ .
+    * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, 
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
+    * Neither the name of the SwarmNet (www.swarmnet.de) project nor the names 
+    of its contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE 
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: ./src/foreign/nvwa/*
 Copyright: 2004-2008, Wu Yongwei <adah at users dot sourceforge dot net>
@@ -69,7 +92,7 @@ License: GPL-2+
 
 Files: ./src/foreign/polyfonts/*
 Copyright: 2003, Bob Pendleton
-License: GPL LGPL-2.1+
+License: GPL or LGPL-2.1+
  On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC
  LICENSE ver 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
  .
@@ -86,7 +109,7 @@ License: GPL-3+
 Files: ./tools/contributed/trafficmodeler/src/shapes/*
 Copyright: 1998-2005, The Regents of the University of California
            1998-2006, The Regents of the University of California
-License: MIT/X11 (BSD like)
+License: MIT/X11
  Permission is hereby granted, without written agreement and without
  license or royalty fees, to use, copy, modify, and distribute this
  software and its documentation for any purpose, provided that the above
@@ -112,7 +135,7 @@ License: MIT/X11 (BSD like)
 Files: ./src/foreign/mersenne/MersenneTwister.h
 Copyright: 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
            2000 - 2003, Richard J. Wagner
-License: BSD (2 clause)
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -150,7 +173,7 @@ License: BSD (2 clause)
 
 Files: ./src/foreign/polyfonts/polyfonts.c
 Copyright: 2003, Bob Pendleton
-License: GPL LGPL-2.1+
+License: GPL and LGPL-2.1+
  On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC
  LICENSE ver 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
  .

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sumo.git