[tasque] [repo] Updated COPYING file



commit ef421a387705964e56b1dca5f2590d3202476090
Author: Antonius Riha <antoniusriha gmail com>
Date:   Tue Oct 30 15:03:57 2012 +0100

    [repo] Updated COPYING file
    
    * COPYING now accounts for other copyright holders than Novell
    * COPYING now mentions that RtmNet library, which is shipped
    with Tasque, is licensed under EPL 1.0.
    * New license statement now also available in Windows license file
    (WindowsSetup/license.rtf)
    * COPYING and LICENSE_EPL are now included in dist target

 COPYING                  |   14 +++++++++++++-
 Makefile.am              |    2 ++
 WindowsSetup/license.rtf |  Bin 1357 -> 37645 bytes
 3 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/COPYING b/COPYING
index 954c0b3..65451c4 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,16 @@
-Copyright (c) 2008 Novell, Inc.
+Tasque is subject to the MIT license. For details see section
+"MIT LICENSE" below or get the license text from
+http://opensource.org/licenses/MIT.
+Tasque uses the RtmNet library, which is licensed under the terms of
+the Eclipse Public License 1.0. For the full text of the license
+consult the file LICENSE_EPL. Alternatively, it is available on
+http://opensource.org/licenses/EPL-1.0.
+
+MIT LICENSE
+-----------
+
+Copyright (c) 2008 - 2011 Novell, Inc.
+Copyright (c) Various contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/Makefile.am b/Makefile.am
index aa783b8..e60b1f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,6 +83,8 @@ EXTRA_DIST = \
 	$(DLL_REFERENCES) \
 	MAINTAINERS \
 	TRANSLATORS \
+	COPYING \
+	LICENSE_EPL \
 	tasque.sln \
 	build/build.csproj \
 	build/Properties/AssemblyInfo.cs \
diff --git a/WindowsSetup/license.rtf b/WindowsSetup/license.rtf
index 02430c6..e0b5a87 100644
Binary files a/WindowsSetup/license.rtf and b/WindowsSetup/license.rtf differ



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]