[scoop] 01/01: copyright: further improvements

Daniel Stender danstender-guest at moszumanska.debian.org
Thu Sep 4 22:03:53 UTC 2014


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

danstender-guest pushed a commit to branch master
in repository scoop.

commit 517ff403e51524143f672a1f9adda3df97599a8c
Author: Daniel Stender <daniel at danielstender.com>
Date:   Fri Sep 5 00:03:30 2014 +0200

    copyright: further improvements
---
 debian/changelog |  2 +-
 debian/copyright | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b6289f..7b888c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,4 +6,4 @@ scoop (0.7.1-1) unstable; urgency=medium
     Scoop in Debian until 2006 was another program (web-based
     collaborative media application).
 
- -- Daniel Stender <debian at danielstender.com>  Thu, 04 Sep 2014 19:10:52 +0200
+ -- Daniel Stender <debian at danielstender.com>  Fri, 05 Sep 2014 00:00:11 +0200
diff --git a/debian/copyright b/debian/copyright
index 08c9c10..86572cc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,8 +33,8 @@ License: Python-0.9
 
 Files: scoop/backports/runpy.py
 Copyright: 2006 Nick Coghlan <ncoghlan at gmail.com>
-License:
- info on module taken out of http://bugs.python.org/issue1429601
+ http://sources.debian.net/src/python2.7/2.7.8-6/Lib/runpy.py/
+License: Python-2.0
 
 Files: scoop/discovery/minusconf.py
 Copyright: 2009 Philipp Hagemeister
@@ -54,7 +54,8 @@ License: Apache-2.0
  On Debian-based systems the full text of the Apache version 2.0 license
  can be found in `/usr/share/common-licenses/Apache-2.0'.
 
-Files: doc/_static/sidebar.js doc/_template/globaltoc.html
+Files: doc/_static/sidebar.js
+       doc/_template/globaltoc.html
 Copyright: 2007-2011 Sphinx Team
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
@@ -80,6 +81,10 @@ License: BSD-2-clause
  (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: doc/_static/copybutton.js
+Copyright: 2014 Python Software Foundation
+License: Python-2.0
+
 License: LGPL-3.0+
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -96,3 +101,48 @@ License: LGPL-3.0+
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in "/usr/share/common-licenses/LGPL-3".
+
+License: Python-2.0
+ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ --------------------------------------------
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
+ and the Individual or Organization ("Licensee") accessing and otherwise using
+ this software ("Python") in source or binary form and its associated
+ documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, PSF hereby
+ grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+ analyze, test, perform and/or display publicly, prepare derivative works,
+ distribute, and otherwise use Python alone or in any derivative version,
+ provided, however, that PSF's License Agreement and PSF's notice of copyright,
+ i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software
+ Foundation; All Rights Reserved" are retained in Python alone or in any
+ derivative version prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on or
+ incorporates Python or any part thereof, and wants to make the derivative work
+ available to others as provided herein, then Licensee hereby agrees to include
+ in any such work a brief summary of the changes made to Python.
+ .
+ 4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES
+ NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT
+ NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
+ PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY
+ INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
+ MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF,
+ EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material breach
+ of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee.  This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote products
+ or services of Licensee, or any third party.
+ .
+ 8. By copying, installing or otherwise using Python, Licensee agrees to be
+ bound by the terms and conditions of this License Agreement.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scoop.git



More information about the debian-science-commits mailing list