[Python-modules-commits] r31908 - in packages/python-keyring/trunk/debian (changelog copyright)

Tue Feb 24 09:03:33 UTC 2015

Date: Tuesday, February 24, 2015 @ 09:03:32
  Author: mitya57
Revision: 31908

Convert debian/copyright to machine-readable format.

Modified:
  packages/python-keyring/trunk/debian/changelog
  packages/python-keyring/trunk/debian/copyright

Modified: packages/python-keyring/trunk/debian/changelog
===================================================================

--- packages/python-keyring/trunk/debian/changelog	2015-02-24 08:47:34 UTC (rev 31907)
+++ packages/python-keyring/trunk/debian/changelog	2015-02-24 09:03:32 UTC (rev 31908)
@@ -5,6 +5,7 @@
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update my e-mail address.
   * Simplify uscan command in get-orig-source target.
+  * Convert debian/copyright to machine-readable format.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 24 Feb 2015 11:39:49 +0300
 

Modified: packages/python-keyring/trunk/debian/copyright
===================================================================
--- packages/python-keyring/trunk/debian/copyright	2015-02-24 08:47:34 UTC (rev 31907)
+++ packages/python-keyring/trunk/debian/copyright	2015-02-24 09:03:32 UTC (rev 31908)
@@ -1,28 +1,23 @@
-This package was debianized by Carl Chenet <chaica at ohmytux.com> on
-Tue, 01 Sep 2009 00:22:25 +0200.
-It was updated in Feb 2012 with the help of a great contribution of Barry
-Warsaw <barry at python.org> from the Ubuntu python-keyring package. Thanks!
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://bitbucket.org/kang/python-keyring-lib
 
-It was downloaded from http://pypi.python.org/pypi/keyring
+Files: *
+Copyright: 2009,      Kang Zhang <jobo.zh at gmail.com>
+           2010-2015, Jason R. Coombs <jaraco at jaraco.com>
+           2013-2014, Dmitry Shachnev <mitya57 at gmail.com>
+License: PSF-2 and MIT
 
-Upstream Author:
+Files: debian/*
+Copyright: 2009-2012, Carl Chenet <chaica at debian.org>
+           2013-2015, Dmitry Shachnev <mitya57 at debian.org>
+License: GPL-3
 
-    Kang Zhang <jobo.zh at gmail.com>
-
-Copyright:
-
-    Copyright Â© 2009 Kang Zhang
-
-Upstream code is double-licensed under Python Software Foundation
-license (PSF) and MIT license.
-
-PSF License text:
-
+License: PSF-2
     1. This LICENSE AGREEMENT is between the Python Software Foundation
     ("PSF"), and the Individual or Organization ("Licensee") accessing and
     otherwise using Python 2.3 software 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,
@@ -32,50 +27,49 @@
     2001, 2002 Python Software Foundation; All Rights Reserved" are
     retained in Python 2.3 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 2.3 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 2.3.
-
+    .
     4. PSF is making Python 2.3 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 2.3 WILL NOT
     INFRINGE ANY THIRD PARTY RIGHTS.
-
+    .
     5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
     2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
     A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3,
     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 2.3, Licensee
     agrees to be bound by the terms and conditions of this License
     Agreement.
 
-MIT license text:
-
+License: MIT
     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:
-
+    .
     The above copyright notice and this permission notice shall be included in
     all copies or substantial portions of the Software.
-
+    .
     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
@@ -84,9 +78,15 @@
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
 
-The Debian packaging is:
-
-    Copyright Â© 2009 Carl Chenet <chaica at ohmytux.com>
-
-and is licensed under the GPL version 3,
-see `/usr/share/common-licenses/GPL-3'.
+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 version 3, as
+    published by the Free Software Foundation.
+    .
+    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 details.
+    .
+    On Debian systems, the full text of the GNU General Public License
+    version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.


