[DRE-commits] [ruby-cookiejar] 06/08: d/copyright: updated to new upstream version (switched to 2-BSD)

Jonas Genannt jonas at brachium-system.net
Mon Feb 17 20:02:39 UTC 2014


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

hggh-guest pushed a commit to branch master
in repository ruby-cookiejar.

commit f28228955eb9cc794790d51508b22ae96f5478f5
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Mon Feb 17 20:56:37 2014 +0100

    d/copyright: updated to new upstream version (switched to 2-BSD)
---
 debian/copyright | 95 ++++++++++++++++++--------------------------------------
 1 file changed, 30 insertions(+), 65 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 7d95bf6..ef2c4cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,74 +1,39 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: cookiejar
-Source: http://rubygems.org/gems/cookiejar
+Source: https://github.com/dwaite/cookiejar
 
 Files: *
-Copyright: 2009 David Waite <david at alkaline-solutions.com>
-License: Ruby's License or GPL
+Copyright: 2009-2014 David Waite and Other Contributors
+License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2013 Praveen Arimbrathodiyil <pravi.a at gmail.com>
-License: Ruby's License or GPL
+           2014 Jonas Genannt <jonas.genannt at capi2name.de>
+License: GPL-3
 
-License: Ruby's License 
- You can redistribute it and/or modify it under either the terms of the GPL
- (see COPYING.txt file), or the conditions below:
- .
-   1. You may make and give away verbatim copies of the source form of the
-      software without restriction, provided that you duplicate all of the
-      original copyright notices and associated disclaimers.
- .
-   2. You may modify your copy of the software in any way, provided that
-      you do at least ONE of the following:
- .
-        a) place your modifications in the Public Domain or otherwise
-           make them Freely Available, such as by posting said
-	         modifications to Usenet or an equivalent medium, or by allowing
-	         the author to include your modifications in the software.
- .
-        b) use the modified software only within your corporation or
-           organization.
- .
-        c) rename any non-standard executables so the names do not conflict
-	         with standard executables, which must also be provided.
- .
-        d) make other distribution arrangements with the author.
- .
-   3. You may distribute the software in object code or executable
-      form, provided that you do at least ONE of the following:
- .
-        a) distribute the executables and library files of the software,
-           together with instructions (in the manual page or equivalent)
-	         on where to get the original distribution.
- .
-        b) accompany the distribution with the machine-readable source of
- 	         the software.
- .
-        c) give non-standard executables non-standard names, with
-           instructions on where to get the original software distribution.
- .
-        d) make other distribution arrangements with the author.
- .
-   4. You may modify and include the part of the software into any other
-      software (possibly commercial).  But some files in the distribution
-      are not written by the author, so that they are not under this terms.
- .
-      They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-      files under the ./missing directory.  See each file for the copying
-      condition.
- .
-   5. The scripts and library files supplied as input to or produced as 
-      output from the software do not automatically fall under the
-      copyright of the software, but belong to whomever generated them, 
-      and may be sold commercially, and may be aggregated with this
-      software.
- .
-   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-      PURPOSE.
+License: BSD-2-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.
+ .
+ 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.
+ .
+ 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 HOLDER 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.
 
-License: GPL
+License: GPL-3
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
  License as published by the Free Software Foundation; either
@@ -78,14 +43,14 @@ License: GPL
  This program is distributed in the hope that it will be
  useful, but WITHOUT ANY WARRANTY; without even the implied
  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
+ PURPOSE. See the GNU General Public License for more
  details.
  .
  You should have received a copy of the GNU General Public
  License along with this package; if not, write to the Free
  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ Boston, MA 02110-1301 USA
  .
  On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
+ License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.

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



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