From 04c7c2243504b0bf0d72c05dc43210580b6dfdb4 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 28 Oct 2007 13:39:50 +0100
Subject: [PATCH] Updated to collectd-4.2.0-1.

 * Updated changelog.
 * Updated copyright.
---
 debian/changelog | 10 ++++++++--
 debian/copyright | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 792c28c..e821b35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,17 @@
-collectd (4.1.3-1) experimental; urgency=low
+collectd (4.2.0-1) experimental; urgency=low
 
   * New upstream release.
     - Added options to collectd2html.pl to specify host and data directory
       (Closes: #438499).
     - Link against a thread-safe version of librrd.
     New plugins:
+    - IPVS connection statistics: ipvs
+    - Statistic of the memcached distributed caching system: memcached
     - Detailed Linux network interface and routing statistics: netlink (32bit
       systems only)
+    - Nginx (a HTTP and E-Mail server/proxy) statistics: nginx
     - Values from SNMP enabled network devices: snmp
+    - Number of TCP connections to specific ports: tcpconns
     - Bitrate and frequency of music played with XMMS: xmms
   * Updated init script to wait for collectd to shut down (Closes: #422208).
   * Merged all plugin packages into the collectd binary package.
@@ -18,8 +22,10 @@ collectd (4.1.3-1) experimental; urgency=low
     -fPIC.
   * Removed debian/examples/myplugin.c and debian/examples/MyPlugin.pm - they
     are included in the upstream sources now.
+  * Added libcurl4-gnutls-dev as option to the libcurl3-gnutls-dev build
+    dependency.
 
- -- Sebastian Harl <sh@tokkee.org>  Thu, 25 Oct 2007 00:54:13 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 28 Oct 2007 13:38:21 +0100
 
 collectd (4.0.7-1) experimental; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index f19cd6d..364f725 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,7 @@ Copyright Holders (in alphabetical order):
 	Alexander Wirt <formorer@formorer.de>
 	Andre M. Hedrick <andre@suse.com>
 	Anthony Gialluca <tonyabg@charter.net>
+	Antony Dovgal <tony@daylessday.org>
 	David Bacher <drbacher@gmail.com>
 	Flavio Stanchina <flavio@stanchina.net>
 	Florent Monbillard <eppo@darox.net>
@@ -24,10 +25,13 @@ Copyright Holders (in alphabetical order):
 	Lyonel Vincent <lyonel@ezix.org>
 	Niki W. Waibel <niki.waibel@newlogic.com>
 	Peter Holik <peter@holik.at>
+	Peter Kese <peter.kese@ijs.si>
 	Scott Garrett <sgarrett@technomancer.com>
 	Sebastian Harl <sh@tokkee.org>
 	Sjoerd van der Berg <harekiet@users.sourceforge.net>
+	Steven Clarke <steven@monmouth.demon.co.uk>
 	Vincent Stehlé <vincent.stehle@free.fr>
+	Wensong Zhang <wensong@linuxvirtualserver.org>
 
 Licenses:
 
@@ -67,6 +71,18 @@ Licenses:
 	Copyright (C) 2007 Sjoerd van der Berg <harekiet@users.sourceforge.net>
 	License: GNU General Public License
 
+	File src/ipvs.c
+	Copyright (C) 1997 Steven Clarke <steven@monmouth.demon.co.uk>
+	Copyright (C) 1998-2004 Wensong Zhang <wensong@linuxvirtualserver.org>
+	Copyright (C) 2003-2004 Peter Kese <peter.kese@ijs.si>
+	Copyright (C) 2007 Sebastian Harl <sh@tokkee.org>
+	License: GNU General Public License
+
+	File src/memcached.c
+	Copyright (C) 2005,2006 Vincent Stehlé
+	Copyright (C) 2007 Antony Dovgal
+	License: GNU General Public License
+
 	File src/mbmon.c
 	Copyright (C) 2006 Flavio Stanchina
 	License: GNU General Public License
-- 
2.30.2