[Python-modules-commits] [epsilon] 12/15: Update debian/copyright and switch to machine-readable format.

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository epsilon.

commit a080b921a010c542b65c0a07f557cac8b821ef6f
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Oct 10 17:26:45 2015 +0200

    Update debian/copyright and switch to machine-readable format.
---
 debian/changelog |  1 +
 debian/copyright | 74 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c78323b..92efb07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ epsilon (0.7.1-1) unstable; urgency=medium
   * Remove obsolete XS-Testsuite field.
   * Bump Standards-Version to 3.9.6 (no changes).
   * Use pypi.debian.net redirector in debian/watch.
+  * Update debian/copyright and switch to machine-readable format.
 
  -- Tristan Seligmann <mithrandi at debian.org>  Sat, 10 Oct 2015 17:16:14 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 14cd40b..9d3cf0f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,40 @@
-This package was debianized by Stefano Zacchiroli <zack at debian.org> on
-Wed, 14 Mar 2007 17:01:00 +0100.
-
-It was downloaded from http://www.divmod.org/trac/wiki/DivmodEpsilon
-
-Upstream Author: Divmod Inc. <http://www.divmod.org/>
-
-Copyright: (C) 2005 Divmod Inc.
-
-License:
-
- 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 AUTHORS OR COPYRIGHT HOLDERS BE 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.
-
- The Debian packaging is Copyright 2007, Stefano Zacchiroli <zack at debian.org>
- and 2008-2009 Tristan Seligmann <mithrandi at mithrandi.net>, and is licensed
- under the same terms as above.
-
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Epsilon
+Source: https://github.com/twisted/epsilon
+
+Files: *
+Copyright: 2005, Divmod Inc
+License: Expat
+
+Files: debian/*
+Copyright: 2007 Stefano Zacchiroli <zack at debian.org>
+           2008-2015 Tristan Seligmann <mithrandi at debian.org>
+License: Expat
+
+License: Expat
+ The MIT License
+ .
+ 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 AUTHORS OR COPYRIGHT HOLDERS BE
+ 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/epsilon.git