[DRE-commits] [ruby-rdiscount] 04/06: Update upstream license

[Alessandro Ghedini]

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

ghedo pushed a commit to branch master
in repository ruby-rdiscount.

commit 144e8188dfef7023e4a751a7a6a430572f052d20
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Thu Apr 10 20:18:13 2014 +0200

    Update upstream license
---
 debian/copyright | 67 ++++++++++++++++++++------------------------------------
 1 file changed, 24 insertions(+), 43 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9b43a5f..8e6a532 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,51 +5,32 @@ Source: http://github.com/rtomayko/rdiscount
 Files: *
 Copyright: 2007 David Loren Parsons
            2008 Ryan Tomayko
-License: BSD-4-clause
- 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, sublicence, 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:
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
  .
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions, and the following disclaimer.
+ 1.  Redistributions of works must retain the original copyright notice,
+     this list of conditions and the following disclaimer.
+ 2.  Redistributions in binary form must reproduce the original copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 3.  Neither my name (David L Parsons) nor the names of contributors to
+     this code may be used to endorse or promote products derived
+     from this work without specific prior written permission.
  .
-  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, and in the same place and form as other
-     copyright, license and disclaimer information.
- .
-  3. The end-user documentation included with the redistribution, if
-     any, must include the following acknowledgment:
- .
-         This product includes software developed by
-         David Loren Parsons <http://www.pell.portland.or.us/~orc>
- .
-     in the same place and form as other third-party acknowledgments.
-     Alternately, this acknowledgment may appear in the software
-     itself, in the same form and location as other such third-party
-     acknowledgments.
- .
-  4. Except as contained in this notice, the name of David Loren
-     Parsons shall not be used in advertising or otherwise to promote
-     the sale, use or other dealings in this Software without prior
-     written authorization from David Loren Parsons.
- .
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 DAVID LOREN PARSONS 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.
+ 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 OWNER 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.
 
 Files: debian/*
 Copyright: 2011 Martin Ueding <dev at martin-ueding.de>

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