[SCM] SUMO packaging. Simulation of Urban MObility. branch, master, updated. 4269d2174615810e4930b0b86c08771f6f166e27

Anton Gladky gladky.anton at gmail.com
Fri Apr 20 21:32:45 UTC 2012


The following commit has been merged in the master branch:
commit 3b219b6d82de909c3efbc4f61120524c9475deb1
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Apr 20 23:21:30 2012 +0200

    Update copyright file.

diff --git a/debian/copyright b/debian/copyright
index fddb385..a874e2b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,11 +33,12 @@ License: UNKNOWN
  FIXME
 
 Files: ./src/foreign/tcpip/*
-Copyright: 2004-2007, the SwarmNet (www.swarmnet.de) project **
-License: BSD
- On Debian systems, the complete text of the BSD license can be found 
- in `/usr/share/common-licenses/BSD'
-
+Copyright: 2004-2007, the SwarmNet (www.swarmnet.de) project
+License: BSD like
+ 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. 
+ 
 Files: ./src/foreign/nvwa/*
 Copyright: 2004-2008, Wu Yongwei <adah at users dot sourceforge dot net>
 License: BSD-like
@@ -118,14 +119,44 @@ License: GPL-2+
  Public License can be found in `/usr/share/common-licenses/GPL'.
 
 Files: ./src/foreign/mersenne/MersenneTwister.h
-Copyright: 1997, - 2002, Makoto Matsumoto and Takuji Nishimura
-  2000, - 2003, Richard J. Wagner
-  HOLDERS AND CONTRIBUTORS
-  OWNER OR
+Copyright: 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
+           2000 - 2003, Richard J. Wagner
 License: BSD (2 clause)
- On Debian systems, the complete text of the BSD license can be found 
- in `/usr/share/common-licenses/BSD'
-
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. 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.
+ .
+ 3. The names of its contributors may not 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.
+ .
+ The original code included the following notice:
+ .
+ When you use this, send an email to: matumoto at math.keio.ac.jp
+ with an appropriate reference to your work.
+ .
+ It would be nice to CC: rjwagner at writeme.com and Cokus at math.washington.edu
+ when you write.
+ 
 Files: ./src/foreign/polyfonts/polyfonts.c
 Copyright: 2003, Bob Pendleton
 License: GPL LGPL-2.1+

-- 
SUMO packaging. Simulation of Urban MObility.



More information about the debian-science-commits mailing list