From c7d818fc88838b0724e820346342b3190bb35705 Mon Sep 17 00:00:00 2001
From: octo <octo>
Date: Tue, 21 Mar 2006 21:56:22 +0000
Subject: [PATCH] Bumped version to 3.9.0 (which is due soon)

---
 ChangeLog        | 12 ++++++++++++
 collectd.spec    |  7 ++++++-
 configure.in     | 21 ++++++++++++++-------
 debian/changelog |  6 ++++++
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7291b5ce..2e086093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-03-21, Version 3.9.0
+	* A plugin to monitor the Apache webserver has been added.
+	  <http://httpd.apache.org/>
+	* A plugin to collect statistics about virtual servers using VServer.
+	  <http://linux-vserver.org/> Thanks to Sebastian Harl for writing
+	  this plugin :)
+	* A plugin for wireless LAN cards has been added. It monitors signal
+	  strength, link quality and noise ratio..
+	* An option to compile collectd with different `step' and `hearbeat'
+	  settings has been added. The size of RRAs is no longer static but
+	  calculated based on the settings for `step' and `width'.
+
 2006-03-14, Version 3.8.2
 	* `utils_mount.c' has been changed to not use the `MNTTAB' defined by
 	  the GNU libc, because it points to `/etc/fstab' rather than
diff --git a/collectd.spec b/collectd.spec
index a74acf12..d06ca04c 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,6 +1,6 @@
 Summary:	Statistics collection daemon for filling RRD files.
 Name:           collectd
-Version:	3.8.1
+Version:	3.9.0
 Release:	1
 Source:		http://verplant.org/collectd/%{name}-%{version}.tar.gz
 License:	GPL
@@ -79,6 +79,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/tape.so*
 %attr(0444,root,root) %{_libdir}/%{name}/traffic.so*
 %attr(0444,root,root) %{_libdir}/%{name}/users.so*
+%attr(0444,root,root) %{_libdir}/%{name}/vserver.so*
+%attr(0444,root,root) %{_libdir}/%{name}/wireless.so*
 %dir /var/lib/collectd
 
 %files mysql
@@ -88,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
 
 %changelog
+* Thu Mar 21 2006 Florian octo Forster <octo@verplant.org> 3.9.0-1
+- New upstream version
+
 * Thu Mar 14 2006 Florian octo Forster <octo@verplant.org> 3.8.2-1
 - New upstream version
 
diff --git a/configure.in b/configure.in
index ac48b82f..af5500ef 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 3.8.2)
+AC_INIT(collectd, 3.9.0)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)
@@ -318,17 +318,24 @@ AC_CHECK_LIB(curl, curl_easy_init,
 	AC_DEFINE(HAVE_LIBCURL, 1, [Define to 1 if you have the 'curl' library (-lcurl).])
 ],
 [with_libcurl="no"])
-AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes")
-
 if test "x$with_libcurl" = "xyes"
 then
-	with_libcurl_libs=`curl-config --libs`
-	if test "x$with_libcurl_libs" != "x"
+	with_libcurl_libs=`curl-config --libs 2>/dev/null`
+	curl_config_status=$?
+
+	BUILD_WITH_LIBCURL_LIBS="-lcurl"
+	if test $curl_config_status -ne 0
 	then
-		BUILD_WITH_LIBCURL_LIBS="$with_libcurl_libs";
-		AC_SUBST(BUILD_WITH_LIBCURL_LIBS)
+		with_libcurl="no"
+	else
+		if test "x$with_libcurl_libs" != "x"
+		then
+			BUILD_WITH_LIBCURL_LIBS="$with_libcurl_libs";
+		fi
 	fi
+	AC_SUBST(BUILD_WITH_LIBCURL_LIBS)
 fi
+AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes")
 
 m4_divert_once([HELP_WITH], [
 collectd additional packages:])
diff --git a/debian/changelog b/debian/changelog
index de8dbb36..d35c75f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+collectd (3.9.0-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Florian Forster <octo@verplant.org>  Tue, 21 Mar 2006 22:52:54 +0200
+
 collectd (3.8.2-1) unstable; urgency=low
 
   * New upstream version
-- 
2.30.2