copyright: Updated for version 1.3.7.

Also, unnecessary whitespace and empty lines have been removed.

diff --git a/debian/copyright b/debian/copyright
index 15a1c694b2bfecf5377e7e869dbb5442c5d714d0..1019655422f822901995485a0e7fdec4dddc010a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,6 @@ except debian/control and debian/changelog, were droppend and redone by
 Bernd Zeimetz <bzed@debian.org> on Wed, 06 Feb 2008 19:14:48 +0100 for the
 RRDtool packaging team <rrdtool@ml.snow-crash.org>.
 
-
 The upstream source was downloaded from:
  http://oss.oetiker.ch/rrdtool/pub/
 
@@ -18,9 +17,9 @@ Copyright:
  A tool for fast logging of numerical data graphical display
  of this data.
 
- Copyright (c) 1998-2008 Tobias Oetiker
+ Copyright (c) 1998-2009 Tobias Oetiker
  All rights reserved.
- 
+
  GNU GPL License
  ===============
 
@@ -38,7 +37,7 @@ Copyright:
  with this program; if not, write to the Free Software
  Foundation, Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
- FLOSS License Exception 
+ FLOSS License Exception
  =======================
  (Adapted from http://www.mysql.com/company/legal/licensing/foss-exception.html)
 
@@ -46,7 +45,7 @@ Copyright:
  applications to be able to use specified GPL-licensed RRDtool
  libraries (the "Program") despite the fact that not all FLOSS licenses are
  compatible with version 2 of the GNU General Public License (the "GPL").
- 
+
  As a special exception to the terms and conditions of version 2.0 of the GPL:
 
  You are free to distribute a Derivative Work that is formed entirely from
@@ -105,7 +104,6 @@ Copyright:
  Zlib/libpng License           -
  Zope Public License           2.0
 
-
 The overhauled Debian packaging, which was started by Bernd Zeimetz on
 Wed, 06 Feb 2008 19:14:48 +0100, is copyrighted under the same license
 as RRDtool, see above.
@@ -114,7 +112,6 @@ On Debian systems, a copy of the GNU General Public License, version 2,
 can be found in the file /usr/share/common-licenses/GPL-2. The symlink
 /usr/share/common-licenses/GPL points to the latest version of the GPL.
 
-
 Files with different copyrights/licenses:
 
  * bindings/python/* (except rrd_extra.h):
@@ -127,12 +124,12 @@ Files with different copyrights/licenses:
    it under the terms of the GNU Lesser General Public License as published
    by the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
- 
+
    py-rrdtool 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 Lesser General Public License for more details.
- 
+
    You should have received a copy of the GNU Lesser General Public License
    along with Foobar; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -147,8 +144,8 @@ Files with different copyrights/licenses:
     Author: Miles Egan <miles@caddr.com>
 
  * bindings/tcl/{ifOctets.tcl.in,tclrrd.c}:
-   
-     Copyright: 
+
+     Copyright:
        Copyright (c) 1999,2000 Frank Strauss
                               Technical University of Braunschweig.
        Thread-safe code in tclrrd.c:
@@ -158,7 +155,7 @@ Files with different copyrights/licenses:
    doc/rrdgraph_data.pod, doc/rrdgraph_examples.pod, doc/rrdgraph_graph.pod,
    doc/rrdgraph_rpn.pod, doc/rrdresize.pod, doc/rrdtutorial.pod:
 
-    Author: Alex van den Bogaerdt <alex@ergens.op.het.net>
+    Author: Alex van den Bogaerdt <alex@vandenbogaerdt.nl>
 
  * doc/rpntutorial.pod:
 
@@ -184,11 +181,10 @@ Files with different copyrights/licenses:
 
     Author: Ketan Patel <k2pattu@yahoo.com>
 
-
  * src/{fnv.h,hash_32.c}:
 
      Please do not copyright this code.  This code is in the public domain.
- 
+
      LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
      INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
      EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -202,22 +198,21 @@ Files with different copyrights/licenses:
        http://reality.sgi.com/chongo/
        EMail: chongo_fnv at prime dot engr dot sgi dot com
 
-
  * src/parsetime.c:
 
     parsetime.c - parse time for at(1)
 
     Copyright (C) 1993, 1994  Thomas Koenig
-   
+
     modifications for English-language times
     Copyright (C) 1993  David Parsons
-   
+
     A lot of modifications and extensions
     (including the new syntax being useful for RRDB)
     Copyright (C) 1999  Oleg Cherevko (aka Olwi Deer)
-   
+
     severe structural damage inflicted by Tobi Oetiker in 1999
-   
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:
@@ -226,7 +221,7 @@ Files with different copyrights/licenses:
     2. The name of the author(s) may not be used to endorse or promote
        products derived from this software without specific prior written
        permission.
-   
+
     THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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.
@@ -238,6 +233,14 @@ Files with different copyrights/licenses:
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+ * src/plbasename.{c,h}:
+
+    Copyright (C) 2005 Syd Logan
+
+    This code is distributed without warranty. You are free to use this
+    code for any purpose, however, if this code is republished or
+    redistributed in its original form, as hardcopy or electronically,
+    then you must include this copyright notice along with the code.
 
  * src/rrd_getopt.{c,h}, src/rrd_getopt1.c:
 
@@ -256,7 +259,7 @@ Files with different copyrights/licenses:
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
- 
+
     You should have received a copy of the GNU Library General Public
     License along with the GNU C Library; see the file COPYING.LIB.  If not,
     write to the Free Software Foundation, Inc.,