update changelog

debian/changelog

@@ -17,6 +17,7 @@ nagios-plugins (1.4.14-1) UNRELEASED; urgency=low
   * Update 06_checkircd.dpatch, which got fixed upstream
   * Add 40_check_http_proxy_auth.dpatch to make check_http able to check proxy
     authorization
+  * Update copyright, thanks to Robert Millan (Closes: 548303)
 
  -- Jan Wagner <waja@cyconet.org>  Thu, 06 Aug 2009 00:11:51 +0200
 

debian/copyright

@@ -33,67 +33,11 @@ Upstream Authors:	Felipe Gustavo de Almeida
 
 Copyright:
 
-Copyright (C) 1996, 2008 Free Software Foundation, Inc.
+Copyright (C) 1985, 2009 Free Software Foundation, Inc.
 
-   This package 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; version 2 dated June, 1991.
+    the Free Software Foundation; either version 2 of the License, or
-
-   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 package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-From upstream README:
-
-   This software is released under the GNU Public License with the additional
-   exemption that compiling, linking and/or using OpenSSL is allowed.
-
-Files with differen Licenses:
-
-	lib/*.c
-	lib/tests/*.c
-	plugins/*.c
-	plugins/runcmd.h
-	plugins/common.h
-	plugins/netutils.h
-	plugins-root/check_*.c
-	gl/basename.c
-	gl/cloexec.c
-	gl/creat-safer.c
-	gl/c-strtod.c
-	gl/d*
-	gl/e*
-	gl/fcntl*
-	gl/fd-safer.c
-	gl/float.*
-	gl/floorf.c
-	gl/fsusage*
-	gl/full*
-	gl/gethostname.c
-	gl/getloadavg.c
-	gl/getopt*
-	gl/intprops.h
-	gl/math.in.h
-	gl/mountlist*
-	gl/open-safer.c
-	gl/pipe-safer.c
-	gl/safe-*
-	gl/stdlib.in.h
-	gl/strerror.c
-	gl/stripslash.c
-	gl/unistd-*
-	gl/xalloc*
-	gl/xmalloc.c
-	gl/xstrndup*
-
-   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,
@@ -102,37 +46,83 @@ Files with differen Licenses:
     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/>
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+    USA.
 
+From upstream README:
+
+   This software is released under the GNU Public License with the additional
+   exemption that compiling, linking and/or using OpenSSL is allowed.
+
+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
 	gl/alloca.in.h
 	gl/as*
 	gl/base64*
+	gl/basename.c
+	gl/cloexec.c
 	gl/config.charset
-	gl/float+.h
+	gl/creat-safer.c
+	gl/c-strtod.c
+	gl/d*
+	gl/e*
+	gl/fcntl*
+	gl/fd-safer.c
+	gl/float.*
+	gl/float
+	gl/floorf.c
+	gl/fsusage*
+	gl/full*
 	gl/gai_strerror.c
 	gl/getaddrinfo*
+	gl/gethostname.c
+	gl/getloadavg.c
+	gl/getopt*
 	gl/gettext.h
 	gl/inet_ntop*
+	gl/intprops.h
 	gl/localcharset*
 	gl/malloc.c
+	gl/math.in.h
+	gl/mountlist*
 	gl/netinet_in.in.h
+	gl/open-safer.c
+	gl/pipe-safer.c
 	gl/printf-*
 	gl/ref-*
 	gl/reg*
+	gl/safe-*
 	gl/size_max.h
 	gl/snprintf.c
 	gl/stdbool.in.h
 	gl/stdint.in.h
 	gl/stdio.in.h
+	gl/stdlib.in.h
 	gl/strdup.c
+	gl/strerror.c
 	gl/string.in.h
+	gl/stripslash.c
 	gl/strndup.c
 	gl/strnlen.c
 	gl/sys_socket.in.h
 	gl/unistd.in.h
+	gl/unistd-*
 	gl/v*
 	gl/wchar.in.h
 	gl/wctype.in.h
+	gl/xalloc*
+	gl/xmalloc.c
+	gl/xsize.h
+	gl/xstrndup*
 	gl/xsize.h
 
     This program is free software; you can redistribute it and/or modify it
@@ -149,6 +139,120 @@ Files with differen Licenses:
     License along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
     USA.
+
+	Makefile.in
+	gl/Makefile.in
+	lib/Makefile.in
+	lib/tests/Makefile.in
+	perlmods/Makefile
+	perlmods/Makefile.in
+	plugins/Makefile.in
+	plugins-root/Makefile.in
+	plugins-scripts/Makefile.in
+	tap/Makefile.in
+
+    This Makefile.in is free software; the Free Software Foundation
+    gives unlimited permission to copy and/or distribute it,
+    with or without modifications, as long as this notice is preserved.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+    even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+    PARTICULAR PURPOSE.
+
+	aclocal.m4
+
+    This file is free software; the Free Software Foundation
+    gives unlimited permission to copy and/or distribute it,
+    with or without modifications, as long as this notice is preserved.
+
+	gl/m4/00gnulib.m4
+	gl/m4/a*.m4
+	gl/m4/b*.m4
+	gl/m4/c*.m4
+	gl/m4/d*.m4
+	gl/m4/e*.m4
+	gl/m4/f*.m4
+	gl/m4/getaddrinfo.m4
+	gl/m4/gethostname.m4
+	gl/m4/getloadavg.m4
+	gl/m4/getopt.m4
+	gl/m4/gettext.m4
+	gl/m4/glibc21.m4
+	gl/m4/gnulib-common.m4
+	gl/m4/h*.m4
+	gl/m4/i*.m4
+	gl/m4/l*.m4
+	gl/m4/m*.m4
+	gl/m4/n*.m4
+	gl/m4/open.m4
+	gl/m4/p*.m4
+	gl/m4/r*.m4
+	gl/m4/s*.m4
+	gl/m4/t*.m4
+	gl/m4/u*.m4
+	gl/m4/v*.m4
+	gl/m4/w*.m4
+	gl/m4/x*.m4
+	m4/np_mysqlclient.m4
+
+    This file is free software; the Free Software Foundation
+    gives unlimited permission to copy and/or distribute it,
+    with or without modifications, as long as this notice is preserved.
+
+        build-aux/install-sh
+
+    Copyright (C) 1994 X Consortium
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to
+    deal in the Software without restriction, including without limitation the
+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+    sell copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the name of the X Consortium shall not
+    be used in advertising or otherwise to promote the sale, use or other deal-
+    ings in this Software without prior written authorization from the X Consor-
+    tium.
+
+    FSF changes to this file are in the public domain.
+
+	tap/tap.*
+
+    All rights reserved.
+
+    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.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.