[Python-modules-commits] [nagiosplugin] 04/11: Update debian/copyright

[Jan Dittberner]

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

jandd pushed a commit to branch master
in repository nagiosplugin.

commit cd50a86c264bd60f55eb9c369c8fb26f0b8d9f04
Author: Jan Dittberner <jandd at debian.org>
Date:   Tue Jul 18 14:27:17 2017 +0200

    Update debian/copyright
---
 debian/changelog |  3 ++-
 debian/copyright | 50 +++++++++-----------------------------------------
 2 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e3a912..cba3462 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ nagiosplugin (1.2.2-2) UNRELEASED; urgency=medium
     debian/control stanza (Closes: #867410)
   * Fix spelling in debian/control long descriptions
   * Add myself to Uploaders field in debian/control
+  * Update debian/copyright
 
- -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 21:44:22 +0200
+ -- Jan Dittberner <jandd at debian.org>  Tue, 18 Jul 2017 14:17:30 +0200
 
 nagiosplugin (1.2.2-1) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index ba9bbe6..07b3fc1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,49 +3,17 @@ Upstream-Name: nagiosplugin
 Source: https://pypi.python.org/pypi/nagiosplugin/
 
 Files: *
-Copyright: Christian Kauhaus <kc at gocept.com>
-License: Zope Public License (ZPL) Version 2.1
- A copyright notice accompanies this license document that identifies the
- copyright holders.
- .
- This license has been certified as open source. It has also been designated as
- GPL compatible by the Free Software Foundation (FSF).
- .
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- .
-   1. Redistributions in source code must retain the accompanying copyright
-      notice, this list of conditions, and the following disclaimer.
-   2. Redistributions in binary form must reproduce the accompanying copyright
-      notice, this list of conditions, and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-   3. Names of the copyright holders must not be used to endorse or promote
-      products derived from this software without prior written permission from
-      the copyright holders.
-   4. The right to distribute this software or to use it for any purpose does
-      not give you the right to use Servicemarks (sm) or Trademarks (tm) of
-      the copyright holders. Use of them is covered by separate agreement with
-      the copyright holders.
-   5. If any files are modified, you must cause the modified files to carry
-      prominent notices stating that you changed the files and the date of any
-      change.
- .
- Disclaimer
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
- 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 HOLDERS 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.
+Copyright: 2010-2016 Christian Kauhaus <kc at gocept.com>
+License: Zope-2.1
 
 Files: debian/*
-Copyright: 2013 Jordan Metzmeier <jmetzmeier01 at gmail.com>
-License: Zope Public License (ZPL) Version 2.1
+Copyright: 2013-2014 Jordan Metzmeier <jmetzmeier01 at gmail.com>
+           2017 Jan Dittberner <jandd at debian.org>
+License: Zope-2.1
+
+License: Zope-2.1
+ Zope Public License (ZPL) Version 2.1
+ .
  A copyright notice accompanies this license document that identifies the
  copyright holders.
  .

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