Merge collectd-3.10.3-1 into bpo branch.

diff --git a/debian/changelog b/debian/changelog
index 06320f1e2955a97f5f352dd5f30ac8b611ea5ca2..4209e55102fd5969d508fc59d20856b6b47e9845 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+collectd (3.10.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Made package binNMUable:
+    - Upstream assures API backward compatibility only between patch releases.
+  * LSBized init script.
+
+ -- Sebastian Harl <sh@tokkee.org>  Mon,  6 Nov 2006 13:09:28 +0000
+
+collectd (3.10.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - Retry connecting to remote host and database in ping and mysql plugins
+      respectively (Closes: #393742).
+  * Replaced libcurl3-dev build dependency with libcurl3-gnutls-dev to prevent
+    linking against libssl.
+
+ -- Sebastian Harl <sh@tokkee.org>  Fri,  3 Nov 2006 15:18:17 +0000
+
 collectd (3.10.1-4~bpo.1) sarge-backports; urgency=low
 
   * Rebuild for Sarge.

diff --git a/debian/collectd.init.d b/debian/collectd.init.d
index 7c8ac291c50f28dab151b6120d88e76d96f09d9d..525b3f5cbfb02515779d17aea4f18629818b2e19 100755 (executable)
--- a/debian/collectd.init.d
+++ b/debian/collectd.init.d
@@ -6,6 +6,17 @@
 #              Sebastian Harl <sh@tokkee.org>
 #
 
+### BEGIN INIT INFO
+# Provides:          collectd
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      $network $named $syslog $time
+# Should-Stop:       $network $named $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: start the statistics collection daemon
+### END INIT INFO
+
 set -e
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

diff --git a/debian/control b/debian/control
index 82598a38a9c09e63438f08bf7b7dc7c6bbcd14f3..7eb9032263410c958716fc5b2a227e208b27d189 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-dev,
- libmysqlclient14-dev, librrd2-dev, libsensors-dev, liboping-dev (> 0.3.3)
+Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev,
+ libmysqlclient14-dev, librrd2-dev, libsensors-dev, liboping-dev (>= 0.3.3)
 Standards-Version: 3.7.2
 
 Package: collectd
@@ -122,7 +122,7 @@ Description: statistics collection daemon (sensors plugin)
 
 Package: collectd-dev
 Architecture: all
-Depends: collectd (= ${Source-Version})
+Depends: collectd (>= ${Source-Version}), collectd (<< 3.11~)
 Description: statistics collection daemon (development files)
  collectd is a small daemon written in C for performance. It reads various
  system statistics and updates RRD files, creating them if necessary. Since

diff --git a/debian/copyright b/debian/copyright
index 2d2879694690dc5e3a92de9aec1c10e89242ac95..9da9bfcc581e1153e99ddedca6c56940fd195e6b 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,7 @@ Copyright Holders (in alphabetical order):
        Sebastian Harl <sh@tokkee.org>
        Vincent Stehlé <vincent.stehle@free.fr>
 
-License:
+Licenses:
 
        Files src/apache.c
              src/apple_sensors.c
@@ -34,45 +34,57 @@ License:
              src/battery.c
              src/wireless.c
        Copyright (C) 2006 Florian Forster <octo@verplant.org>
+       License: GNU General Public License
 
        File src/apcups.c
        Copyright (C) 2006 Anthony Gialluca <tonyabg@charter.net>
        Copyright (C) 2000-2004 Kern Sibbald
        Copyright (C) 1996-99 Andre M. Hedrick <andre@suse.com>
+       License: GNU General Public License
 
        File src/cpufreq.c
        Copyright (C) 2005, 2006 Peter Holik <peter@holik.at>
+       License: GNU General Public License
 
        File src/hddtemp.c
        Copyright (C) 2005, 2006 Vincent Stehlé <vincent.stehle@free.fr>
+       License: GNU General Public License
 
        File src/nfs.c
        Copyright (C) 2005, 2006 Jason Pepas <cell@ices.utexas.edu>
+       License: GNU General Public License
 
        File src/processes.c
        Copyright (C) 2005 Lyonel Vincent <lyonel@ezix.org>
        Copyright (C) 2006 Florian Forster <octo@verplant.org> (Mach code)
+       License: GNU General Public License
 
        File src/serial.c
        Copyright (C) 2005, 2006 David Bacher <drbacher@gmail.com>
+       License: GNU General Public License
 
        File src/tape.c
        Copyright (C) 2005, 2006 Scott Garrett <sgarrett@technomancer.com>
+       License: GNU General Public License
 
        File src/users.c
        Copyright (C) 2005, 2006 Sebastian Harl <sh@tokkee.org>
+       License: GNU General Public License
 
        Files src/utils_debug.c
              src/utils_debug.h
              src/utils_mount.c
              src/utils_mount.h
        Copyright (C) 2005, 2006 Niki W. Waibel <niki.waibel@gmx.net>
+       License: GNU General Public License
 
        File src/vserver.c
        Copyright (C) 2006 Sebastian Harl <sh@tokkee.org>
+       License: GNU General Public License
 
        All other files (except libltdl/* and src/libconfig/*):
        Copyright (C) 2005, 2006 Florian Forster <octo@verplant.org>
+       License: GNU General Public License
 
        This package is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -95,10 +107,12 @@ can be found in `/usr/share/common-licenses/GPL'.
        File libltdl/ltdl.c
        Copyright (C) 1998-2000, 2004, 2005 Free Software Foundation, Inc.
        Originally by Thomas Tanner <tanner@ffii.org>
+       License: GNU Lesser General Public License
 
        File libltdl/ltdl.h
        Copyright (C) 1998-2000 Free Software Foundation, Inc.
        Originally by Thomas Tanner <tanner@ffii.org>
+       License: GNU Lesser General Public License
        
        This library is free software; you can redistribute it and/or
        modify it under the terms of the GNU Lesser General Public