[ofw] [PATCH] dapl-2.0: update Copyright file and include the 3 license files in distribution
Davis, Arlin R
arlin.r.davis at intel.com
Wed Feb 3 14:15:03 PST 2010
Update Copyright file and include the 3 license files in distribution
Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
---
COPYING | 16 ++++------------
Makefile.am | 3 +++
dapl.spec.in | 2 +-
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/COPYING b/COPYING
index 2012c04..35ba319 100644
--- 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 23f33e8..bf82853 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -505,6 +505,9 @@ EXTRA_DIST = dat/common/dat_dictionary.h \
dapl/udapl/libdaplofa.map \
dapl/udapl/libdaploscm.map \
dapl/udapl/libdaploucm.map \
+ LICENSE.txt \
+ LICENSE2.txt \
+ LICENSE3.txt \
dapl.spec.in \
$(man_MANS) \
test/dapltest/include/dapl_bpool.h \
diff --git a/dapl.spec.in b/dapl.spec.in
index 7a532b3..92c4398 100644
--- a/dapl.spec.in
+++ b/dapl.spec.in
@@ -121,7 +121,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,-)
--
1.5.2.5
More information about the ofw
mailing list