Move information in COPYING to LICENSE and remove COPYING.

Also, rearrange copyright years.

Also also, state NORDUnet as being the provider of the software in the
BSD license.

diff --git a/COPYING b/COPYING
deleted file mode 100644 (file)
index a0b8800..0000000
--- a/COPYING
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
-
-See the LICENSE file for licensing terms.

diff --git a/LICENSE b/LICENSE
index 35c2b98..b4f2f7b 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -7,8 +7,9 @@ Public License Version 2 or later (GPL).
 Alternatively the radsecproxy source code is subject to the terms of the
 below BSD style license.
 
-* Copyright (c) 2006-2010, UNINETT AS
-* Copyright (c) 2010,2011, NORDUnet A/S
+* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+* Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+* Copyright (c) 2010-2012, NORDUnet A/S.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -18,14 +19,15 @@ below BSD style license.
 *     * 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  distribution.
-*     * Neither the name of the UNINETT AS nor the names of its
-*       contributors may be used to endorse or promote products derived
-*       from this software without specific prior written permission.
+*     * Neither the name of NORDUnet A/S 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 UNINETT AS ``AS IS'' AND ANY
+* THIS SOFTWARE IS PROVIDED BY NORDUNET AS ``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 UNINETT AS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL NORDUNET AS 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