From b07be64c06a5504f20202763d39eeab31b3e1507 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Thu, 30 Sep 2010 16:32:37 +0000 Subject: [PATCH] Based on previous commit (which updated http://scm.dspace.org/svn/repo/licenses/LICENSE_HEADER), renaming the LICENSING_NOTICE.txt files to just NOTICE. Small modifications to README files (updated links, and added a link to online version of source code license). Copied the LICENSE file to the root source code directory (again per LICENSE_HEADER update). git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5374 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- LICENSE | 40 +++++++++++++++++++++++++ LICENSING_NOTICE.txt => NOTICE | 0 README | 7 +++-- dspace/{LICENSING_NOTICE.txt => NOTICE} | 0 dspace/README | 8 +++-- 5 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 LICENSE rename LICENSING_NOTICE.txt => NOTICE (100%) rename dspace/{LICENSING_NOTICE.txt => NOTICE} (100%) diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000000..fd00a988b428 --- /dev/null +++ b/LICENSE @@ -0,0 +1,40 @@ +DSpace source code license: + + +Copyright (c) 2002-2010, DuraSpace. All rights reserved. + +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. + +- Neither the name DuraSpace nor the name of the DSpace Foundation +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 COPYRIGHT HOLDERS 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 COPYRIGHT +HOLDERS 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. + + +DSpace uses third-party libraries which may be distributed under +different licenses to the above. These licenses are located in +the lib/licenses directory. You must agree to the terms of these +licenses, in addition to the above DSpace source code license, in +order to use this software. diff --git a/LICENSING_NOTICE.txt b/NOTICE similarity index 100% rename from LICENSING_NOTICE.txt rename to NOTICE diff --git a/README b/README index 79fdee293ab2..625c49978056 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ DSpace version information can be found in this release package under Documentation for the most recent stable release may be viewed online at dspace.org: - - http://dspace.org/current-release/latest-release/ + - http://dspace.org/latest-release/ Installation instructions for other version may be different, so you @@ -35,7 +35,7 @@ Detailed Issue Tracking for DSpace is done on our JIRA Issue Tracker To contribute to DSpace, please see: - - http://wiki.dspace.org/index.php/HowToContribute + - https://wiki.duraspace.org/display/DSPACE/HowToContribute For more details about DSpace, including a list of service providers, @@ -44,4 +44,7 @@ places to seek help, news articles and lists of other users, please see: - http://www.dspace.org/ +DSpace source code licensing information available online at: + - http://www.dspace.org/license/ + Copyright (c) 2002-2010, DuraSpace. All rights reserved. diff --git a/dspace/LICENSING_NOTICE.txt b/dspace/NOTICE similarity index 100% rename from dspace/LICENSING_NOTICE.txt rename to dspace/NOTICE diff --git a/dspace/README b/dspace/README index f46f9b34a8bd..cd06273192f7 100644 --- a/dspace/README +++ b/dspace/README @@ -10,7 +10,7 @@ DSpace version information can be found in this release package under Documentation for the most recent stable release may be viewed online at dspace.org: - - http://dspace.org/current-release/latest-release/ + - http://dspace.org/latest-release/ Installation instructions for other version may be different, so you @@ -35,7 +35,7 @@ Detailed Issue Tracking for DSpace is done on our JIRA Issue Tracker To contribute to DSpace, please see: - - http://wiki.dspace.org/index.php/HowToContribute + - https://wiki.duraspace.org/display/DSPACE/HowToContribute For more details about DSpace, including a list of service providers, @@ -44,4 +44,8 @@ places to seek help, news articles and lists of other users, please see: - http://www.dspace.org/ +DSpace source code licensing information available online at: + - http://www.dspace.org/license/ + Copyright (c) 2002-2010, DuraSpace. All rights reserved. +