[Python-modules-commits] [python-future] 01/01: d/copyright: Various fixes of errors detected by Lintian

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository python-future.

commit b2b6d09c6054bd2ee84972f4b5309c8872259040
Author: Vincent Bernat <vincent at bernat.im>
Date:   Tue May 3 22:14:42 2016 +0200

    d/copyright: Various fixes of errors detected by Lintian
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/copyright | 24 +++++++++++-------------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb8b0bf..6d89904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ python-future (0.15.2-2) UNRELEASED; urgency=medium
   [ Vincent Bernat ]
   * d/control: Bump Standards-Version.
   * d/rules: Switch to pybuild.
+  * d/copyright: Various fixes in license names and file format.
   * Add a patch to fix some failing tests with Python 3.5.
   * Remove configparser module and depends on python-configparser
     instead. Closes: #822157.
diff --git a/debian/control b/debian/control
index ff89176..c8be120 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: python-future
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Barry Warsaw <barry at debian.org>
+Uploaders: Barry Warsaw <barry at debian.org>, Vincent Bernat <bernat at debian.org>
 Build-Depends: debhelper (>= 9),
                dh-python,
                python-all (>= 2.6.6-3~),
diff --git a/debian/copyright b/debian/copyright
index fbe94f9..ab73408 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,20 +2,21 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: future
 Source: git://github.com/PythonCharmers/python-future.git
 
-Files: debian/*
-Copyright: (c) 2014, Thomas Goirand <zigo at debian.org>
-License: Expat
-
 Files: *
 Copyright: (c) 2013-2015, Ed Schofield <ed at pythoncharmers.com>
            (c) 2013-2015, Python Charmers Pty Ltd, Australia
 License: Expat
 
+Files: debian/*
+Copyright: (c) 2014, Thomas Goirand <zigo at debian.org>
+License: Expat
+
 Files: src/libfuturize/fixer_util.py
 Copyright: (c) 2013-2015, Ed Schofield <ed at pythoncharmers.com>
            (c) 2013-2015, Python Charmers Pty Ltd, Australia
            (c) 2011 by Armin Ronacher.
-License: PSF-2-Apache-2.0-BSD
+License: PSF-2 and Apache-2 and BSD-3-clause
+Comment:
  This files is bound to the terms of both PSF-2, Apache-2.0 and BSD, which text
  are included below.
 
@@ -28,7 +29,7 @@ License: PSF-2
 Files: src/past/utils/__init__.py
 Copyright: (c) 2013-2015, Ed Schofield <ed at pythoncharmers.com>
            (c) 2013-2015, Python Charmers Pty Ltd, Australia
-License: Expat-BSD
+License: Expat and BSD-3-clause
 Comment:
  Except with_metaclass, which is under the BSD license, everything else is
  under the Expat license (see below for individual text).
@@ -40,10 +41,10 @@ License: PSF-2
 Files: src/future/utils/__init__.py
 Copyright: (c) 2013-2015, Ed Schofield <ed at pythoncharmers.com>
            (c) 2013-2015, Python Charmers Pty Ltd, Australia
-License: Expat-BSD
+License: Expat and BSD-3-clause
 Comment:
  Some of the functions in this module come from the following sources:
-  * Jinja2 (BSD licensed: see
+  * Jinja2 (BSD-3-clause licensed: see
     https://github.com/mitsuhiko/jinja2/blob/master/LICENSE)
   * Pandas compatibility module pandas.compat
   * six.py by Benjamin Peterson
@@ -51,7 +52,8 @@ Comment:
 
 Files: src/future/utils/surrogateescape.py
 Copyright: (c) Victor Stinner
-License: PSF-2-BSD
+License: PSF-2 and BSD-2-clause
+Comment:
  This code is released under the Python license and the BSD-2-clause license
  .
  See below for individual license texts.
@@ -228,7 +230,3 @@ License: BSD-2-clause
  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: Expat-BSD
- Mixed licensing between Expat and BSD.  See comment section Expat-BSD
- licensed copyright paragraphs above for details.

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