[Python-modules-commits] r34043 - in packages/nevow/trunk/debian (changelog copyright)

[mithrandi at users.alioth.debian.org]

    Date: Sunday, August 30, 2015 @ 03:54:31
  Author: mithrandi
Revision: 34043

Update debian/copyright to machine-readable format.

Modified:
  packages/nevow/trunk/debian/changelog
  packages/nevow/trunk/debian/copyright

Modified: packages/nevow/trunk/debian/changelog
===================================================================
--- packages/nevow/trunk/debian/changelog	2015-08-30 03:51:43 UTC (rev 34042)
+++ packages/nevow/trunk/debian/changelog	2015-08-30 03:54:31 UTC (rev 34043)
@@ -5,6 +5,7 @@
   * Remove unnecessary Testsuite control field.
   * Switch to pypi.debian.net redirector.
   * Add Lintian overrides about binaries in python-nevow.
+  * Update debian/copyright to machine-readable format.
 
  -- Tristan Seligmann <mithrandi at debian.org>  Sun, 22 Jun 2014 23:46:29 +0200
 

Modified: packages/nevow/trunk/debian/copyright
===================================================================
--- packages/nevow/trunk/debian/copyright	2015-08-30 03:51:43 UTC (rev 34042)
+++ packages/nevow/trunk/debian/copyright	2015-08-30 03:54:31 UTC (rev 34043)
@@ -1,4 +1,5 @@
-This package was downloaded from http://divmod.org/trac/wiki/DivmodNevow
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/twisted/nevow
 
 Files: *
 Copyright: © 2004
@@ -16,7 +17,24 @@
    Tommi Virtanen
    Michal Pasternak
    Valentino Volonghi
-License: MIT
+License: Expat
+
+Files: examples/blogengine/smtpserver.py
+Copyright: © 2001-2004 Twisted Matrix Laboratories
+License: Expat
+
+Files: nevow/js/Divmod/Base.js
+Copyright: © 2005 Bob Ippolito
+License: Expat
+
+Files: debian/*
+Copyright: © 2004 Tommi Virtanen <tv at debian.org>
+           © 2007-2008 Vincent Bernat <bernat at debian.org>
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+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
@@ -24,10 +42,10 @@
  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
@@ -35,19 +53,3 @@
  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.
-
-Files: examples/blogengine/smtpserver.py
-Copyright: © 2001-2004 Twisted Matrix Laboratories
-License: MIT
-
-Files: nevow/js/Divmod/Base.js
-Copyright: © 2005 Bob Ippolito
-License: MIT
-
-Files: debian/*
-Copyright: © 2004 Tommi Virtanen <tv at debian.org>
-           © 2007-2008 Vincent Bernat <bernat at debian.org>
-License: GPL-2+
-
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL-2'.