diff options
author | Denis Laxalde <denis@laxalde.org> | 2015-10-27 23:33:08 +0100 |
---|---|---|
committer | Denis Laxalde <denis@laxalde.org> | 2015-10-27 23:41:35 +0100 |
commit | 2b3b9f02a9cb6ce338c2705305bd5f7f58fe7c60 (patch) | |
tree | f8d7633d9cd42e10357bb013b28f6c41c6c18a59 | |
parent | 95b28cfec3a328dc0260267455a5c111c3d74c9e (diff) |
Fix Lintian warnings about debian/copyright
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/copyright | 78 | ||||
-rw-r--r-- | debian/source.lintian-overrides | 1 |
3 files changed, 40 insertions, 42 deletions
diff --git a/debian/changelog b/debian/changelog index f90b26f..86ee186 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ 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 710da56..7ae1bd6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,10 +2,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: numpydoc Source: http://pypi.python.org/pypi/numpydoc -Files: numpydoc.py docscrape.py docscrape_sphinx.py phantom_import.py +Files: numpydoc/numpydoc.py numpydoc/docscrape.py + numpydoc/docscrape_sphinx.py numpydoc/phantom_import.py Copyright: 2008, Stefan van der Walt <stefan@mentat.za.net> 2008, Pauli Virtanen <pav@iki.fi> -License: +License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -29,33 +30,12 @@ License: IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: compiler_unparse.py comment_eater.py traitsdoc.py +Files: numpydoc/compiler_unparse.py numpydoc/comment_eater.py + numpydoc/traitsdoc.py Copyright: 2006 Enthought, Inc. -License: - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of Enthought, Inc. nor the names of its contributors may - be used to endorse or promote products derived from this software without - specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 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: BSD-3-clause -Files: plot_directive.py +Files: numpydoc/plot_directive.py Copyright: 2002-2008 John D. Hunter License: 1. This LICENSE AGREEMENT is between John D. Hunter (“JDH”), and the @@ -102,21 +82,35 @@ License: 8. By copying, installing or otherwise using matplotlib 0.98.3, Licensee agrees to be bound by the terms and conditions of this License Agreement. +Files: * +Copyright: Pauli Virtanen and others +License: BSD-3-clause + Files: debian/* Copyright: 2012 Denis Laxalde <denis@laxalde.org> -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 as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - 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. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. +License: BSD-3-clause + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the names of the project authors nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. . - On Debian systems, the complete text of the GNU General Public License - can be found in the `/usr/share/common-licenses/GPL' file. + THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER 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. diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides new file mode 100644 index 0000000..d1ef683 --- /dev/null +++ b/debian/source.lintian-overrides @@ -0,0 +1 @@ +numpydoc source: empty-short-license-in-dep5-copyright |