[Pkg-nagios-changes] [pkg-nagios-plugins] 318/413: update copyright

[Jan Wagner]

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

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit 1ddf892fc00859617b50ebb7e2d1ecc1e901653d
Author: Jan Wagner <waja at cyconet.org>
Date:   Wed Jun 27 20:29:06 2012 +0000

    update copyright
---
 debian/changelog |  1 +
 debian/copyright | 48 ++++++++++++++++++++++++++++++++++--------------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e21fb8e..dcdec85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ nagios-plugins (1.4.16-1) UNRELEASED; urgency=low
     - 03_check_disk_smb_perfdata.dpatch
     - 10_check_dhcp_Fix-handling-of-pad-options.dpatch
     - 11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch
+  * Updated debian/copyright
 
  -- Jan Wagner <waja at cyconet.org>  Thu, 14 Jun 2012 10:55:42 +0200
 
diff --git a/debian/copyright b/debian/copyright
index fee0b43..0e83611 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,6 +26,7 @@ Upstream Authors:	Felipe Gustavo de Almeida
 			Matthew Kent
 			Harper Mann
 			Benoit Mortier
+			Sven Nierlein
 			Nathan Vonnahme
 			Ton Voon
 			Holger Weiss
@@ -35,20 +36,21 @@ Copyright:
 
 Copyright (C) 1985, 2009 Free Software Foundation, Inc.
 
-    This program is free software; you can redistribute it and/or modify
+    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 2 of the License, or
+    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,
+    This package 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, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-    USA.
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
 From upstream README:
 
@@ -57,14 +59,32 @@ From upstream README:
 
 Files with different Licenses:
 
-	lib/*.c
-	lib/tests/*.c
-	plugins/*.c
-	plugins/runcmd.h
-	plugins/common.h
-	plugins/netutils.h
-	plugins-root/check_*.c
-	plugins-root/pst3.c
+	build-aux/config.guess
+	build-aux/config.sub
+	build-aux/ltmain.sh
+	contrib/check_cpqarray.c
+	contrib/check_linux_raid.pl
+	contrib/check_traceroute-pure_perl.pl
+	contrib/check_cluster2.c
+	contrib/check_snmp_printer.pl
+	contrib/check_http-with-client-certificate.c
+	contrib/check_cluster.c
+	plugins-scripts/check_mailq.pl
+
+    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 2 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, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 	gl/alloca.in.h
 	gl/as*
 	gl/base64*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git