[Python-modules-commits] [numpydoc] 01/01: Add 0.5-2 changelog entry and remove lintian override, really fixing the warning

[Denis Laxalde]

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

dlax-guest pushed a commit to branch master
in repository numpydoc.

commit 07e64e9189bbd46a20f4f59e9e8670e92a70ed15
Author: Denis Laxalde <denis.laxalde at logilab.fr>
Date:   Wed Oct 28 08:09:00 2015 +0100

    Add 0.5-2 changelog entry and remove lintian override, really fixing the warning
---
 debian/changelog                | 11 ++++++++---
 debian/copyright                |  2 +-
 debian/source.lintian-overrides |  1 -
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86ee186..d887475 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+numpydoc (0.5-2) UNRELEASED; urgency=medium
+
+  * Update debian/copyright to mention all source files and license short
+    names; switch to BSD license for the Debian packaging to be consistent
+    with upstream (Closes: #803188).
+
+ -- Denis Laxalde <denis at laxalde.org>  Wed, 28 Oct 2015 08:07:45 +0100
+
 numpydoc (0.5-1) unstable; urgency=medium
 
   * Team upload.
@@ -14,9 +22,6 @@ numpydoc (0.5-1) unstable; urgency=medium
     + Update Standards-Version (no change needed)
   * debian/rules: use pybuild.
   * Drop clean-setup patch (included upstream)
-  * Update debian/copyright to mention all files and add an override for
-    exotic license with no short name; switch to BSD license for the Debian
-    packaging to be consistent with upstream (Closes: #803188).
 
   [ Barry Warsaw ]
   * debian/watch: Use the pypi.debian.net redirector.
diff --git a/debian/copyright b/debian/copyright
index 7ae1bd6..6ffc7bf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,7 +37,7 @@ License: BSD-3-clause
 
 Files: numpydoc/plot_directive.py
 Copyright: 2002-2008 John D. Hunter
-License:
+License: Python-2.0
  1. This LICENSE AGREEMENT is between John D. Hunter (“JDH”), and the
  Individual or Organization (“Licensee”) accessing and otherwise using
  matplotlib software in source or binary form and its associated
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index d1ef683..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-numpydoc source: empty-short-license-in-dep5-copyright

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