[Pkg-ofed-commits] r223 - qperf/trunk/debian

[gmpc-guest at alioth.debian.org]

Author: gmpc-guest
Date: 2009-03-20 13:27:26 +0000 (Fri, 20 Mar 2009)
New Revision: 223

Modified:
   qperf/trunk/debian/copyright
Log:
Update licence to be dual GPL2 / BSD 
(terms are in src/*.c files)


Modified: qperf/trunk/debian/copyright
===================================================================
--- qperf/trunk/debian/copyright	2009-03-18 17:06:40 UTC (rev 222)
+++ qperf/trunk/debian/copyright	2009-03-20 13:27:26 UTC (rev 223)
@@ -18,11 +18,36 @@
  Copyright (c) 2006-2008 QLogic Corporation.  All rights reserved.
 
 License:
+ 
+ This software is available to you under a choice of one of two
+ licenses.  You may choose to be licensed under the terms of the GNU
+ General Public License (GPL) Version 2, available from the file
+ /usr/share/common-licenses/GPL-2 on this debian system, or the
+ OpenIB.org BSD license below:
 
-This software is licensed under the GPL v2, a copy of which can be
-found in the file '/usr/share/common-licenses/GPL-2' on your Debian
-system.
+     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.
+
+ 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.
+
+
 The Debian packaging is copyright 2009, Genome Research Ltd and
 is licensed under the GPL v2, see `/usr/share/common-licenses/GPL-2'.