[Pkg-nagios-changes] [SCM] Debian packaging for mod gearman. branch, master, updated. debian/1.3.0-1-7-g46a112f

Wed Jun 6 22:30:11 UTC 2012

The following commit has been merged in the master branch:
commit 1360d3b5213062f4fcbeeae73c878d54c71aff58
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Wed Jun 6 22:35:28 2012 +0200

    Revise debian/copyright

diff --git a/debian/copyright b/debian/copyright
index fa0f457..3c967cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,15 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: Mod Gearman
-Maintainer: Stig Sandbeck Mathisen <ssm at debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Mod Gearman
 Source: http://labs.consol.de/nagios/mod-gearman/
 
 Files: *
-Copyright: 2010, Sven Nierlein <sven.nierlein at consol.de>
+Copyright: 2010-2012, Sven Nierlein <sven.nierlein at consol.de>
+           2010 Matthias Flacke <matthias.flacke at gmx.de>
+           2004 Nik Clayton
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2010, Stig Sandbeck Mathisen <ssm at debian.org>
+Copyright: 2010-2012, Stig Sandbeck Mathisen <ssm at debian.org>
 License: GPL-3+
 
 Files: include/nagios/*
@@ -18,56 +19,58 @@ License: GPL-2
 Files: include/libgearman/*
 Copyright: 2006-2010 Brian Aker,
            2008-2010 Eric Day
-License:
-Gearman server and library
-Copyright (C) 2008 Brian Aker, Eric Day
-All rights reserved.
+License: BSD-3-clause
+ Gearman server and library
+ Copyright (C) 2008 Brian Aker, Eric Day
+ All rights reserved.
+ .
+ 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.
+ .
+ * The names of its contributors may not 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.
 
-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.
-
-    * The names of its contributors may not 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.
-
-Files: include/base64.c, common/base64.c
+Files: include/base64.c common/base64.c
 Copyright: Unknown
- Downloaded from <http://freecode-freecode.blogspot.com/>
 License: unknown
+ Downloaded from <http://freecode-freecode.blogspot.com/>
 
-Files: include/rijndael.h, common/rijndael.c
-Copyright: Public domain
+Files: include/rijndael.h common/rijndael.c
+Copyright: 2002, Philip J. Erdelsky <pje at efgh.com>
+License: Public domain
+ This software is in the public domain
 
-Files: include/send_multi.h, tools/send_multi.c
-Copyright: 2010 Matthias Flacke <matthias.flacke at gmx.de>
+Files: common/md5.c include/polarssl/*
+Copyright: 2006-2010, Brainspark B.V.
+License: GPL-2+
 
-Files: t/tap.[ch]
-Copyright: 2004 Nik Clayton
+License: GPL-2
+ See file:///usr/share/common-licenses/GPL-2 for details
 
-Files: common/md5.c, include/polarssl/*
-Copyright: 2006-2010, Brainspark B.V.
 License: GPL-2+
+ See file:///usr/share/common-licenses/GPL-2 for details
 
-License: GPL-3
+License: GPL-3+
  See file:///usr/share/common-licenses/GPL-3 for details

-- 
Debian packaging for mod gearman.

