Update Copyright file and include the 3 license files in distribution

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>

diff --git a/COPYING b/COPYING
index 2012c043d56371401d370ba448f7043b56567bf7..35ba3196ab6eb298ca92fd174128256f145c0bf4 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
 #
 # Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.
 # Copyright (c) 2005 Voltaire Inc.  All rights reserved.
-# Copyright (c) 2005 Intel Corporation. All rights reserved.
+# Copyright (c) 2005-2010 Intel Corporation. All rights reserved.
 # Copyright (c) 2004-2005, Mellanox Technologies, Inc. All rights reserved. 
 # Copyright (c) 2003 Topspin Corporation.  All rights reserved. 
 # Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
@@ -9,19 +9,13 @@
 # This Software is licensed under one of the following licenses:
 #
 # 1) under the terms of the "Common Public License 1.0" a copy of which is
-#    in the file LICENSE.txt in the root directory. The license is also
-#    available from the Open Source Initiative, see
-#    http://www.opensource.org/licenses/cpl.php.
+#    in the file LICENSE.txt in the root directory. 
 #
 # 2) under the terms of the "The BSD License" a copy of which is in the file
-#    LICENSE2.txt in the root directory. The license is also available from
-#    the Open Source Initiative, see
-#    http://www.opensource.org/licenses/bsd-license.php.
+#    LICENSE2.txt in the root directory. 
 #
 # 3) under the terms of the "GNU General Public License (GPL) Version 2" a 
-#    copy of which is in the file LICENSE3.txt in the root directory. The 
-#    license is also available from the Open Source Initiative, see
-#    http://www.opensource.org/licenses/gpl-license.php.
+#    copy of which is in the file LICENSE3.txt in the root directory. 
 #
 # Licensee has the right to choose one of the above licenses.
 #
@@ -32,5 +26,3 @@
 # notice, one of the license notices in the documentation
 # and/or other materials provided with the distribution.
 #
-
-

diff --git a/Makefile.am b/Makefile.am
index 9c236e1921006022fc733d83daf278d7d92144a2..b35318056c4e68e7c8712c6eabf4f408bd4668e7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -354,6 +354,9 @@ EXTRA_DIST = dat/common/dat_dictionary.h \
             dapl/udapl/libdaplcma.map \
              dapl/udapl/libdaplscm.map \
             dapl.spec.in \
+            LICENSE.txt \
+            LICENSE2.txt \
+            LICENSE3.txt \
             $(man_MANS) \
             test/dapltest/include/dapl_bpool.h \
             test/dapltest/include/dapl_client_info.h \

diff --git a/dapl.spec.in b/dapl.spec.in
index 1045f46936589fde2752ad99d933017d59e9ce26..fec23bf4cd842b7b5ec957961ee15b7b41c67cff 100644 (file)
--- a/dapl.spec.in
+++ b/dapl.spec.in
@@ -117,7 +117,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libda*.so.*
-%doc AUTHORS README ChangeLog
+%doc AUTHORS README COPYING ChangeLog LICENSE.txt LICENSE2.txt LICENSE3.txt
 
 %files devel
 %defattr(-,root,root,-)