[Debian-ha-svn-commits] [SCM] corosync Debian packaging branch, master, updated. debian/1.2.1-3-14-g3c3b0c0

[Guido Günther]

The following commit has been merged in the master branch:
commit 3c3b0c0aeca27d834d89f7c3fdf1ce2709c1d58b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Dec 13 14:01:23 2010 +0100

    Include BSD license instead of referencing it

diff --git a/debian/copyright b/debian/copyright
index cec050c..c84929f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -44,9 +44,32 @@ License:
 
     All files unless noted otherwise:
 
-	This software licensed under BSD license. On Debian systems, the
-        complete text of the BSD License can be found in
-        `/usr/share/common-licenses/BSD'.
+        Copyright (c) The Regents of the University of California.
+        All rights reserved.
+
+        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. Neither the name of the University 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 REGENTS 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 REGENTS 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.
 
     exec/crypto.c:
     exec/crypto.h:

-- 
corosync Debian packaging