[DRE-commits] [ruby-oj] 02/06: source code relicensed from BSD-3-clause to Expat

Cédric Boutillier boutil at moszumanska.debian.org
Fri May 1 19:56:10 UTC 2015


This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-oj.

commit 59499526680d6f62b1161a2cd6567fa66e83e406
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri May 1 14:41:39 2015 +0200

    source code relicensed from BSD-3-clause to Expat
---
 debian/copyright | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 61fb003..80f4799 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,34 +3,28 @@ Upstream-Name: oj
 Source: https://github.com/ohler55/oj
 
 Files: *
-Copyright: 2012 Peter Holer <peter at holer.com>
-License: BSD-3-clause
+Copyright: 2012-2015 Peter Holer <peter at holer.com>
+License: Expat
 
 Files: debian/*
-Copyright: 2013 Cédric Boutillier <boutil at debian.org>
-License: BSD-3-clause
+Copyright: 2013-2015 Cédric Boutillier <boutil at debian.org>
+License: Expat
 
-License: BSD-3-clause
- All rights reserved.
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
  .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
  .
- 1. Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
- 2. 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.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED '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 AUTHOR 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.
+ 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-oj.git



More information about the Pkg-ruby-extras-commits mailing list