Updated changelog to 3.11.2-1.

Removed email-ignore-size-le-0.dpatch and sensors-ignorelist.dpatch, which
have been merged upstream.

diff --git a/debian/changelog b/debian/changelog
index 4f050b90c79ca44eecd7b457c3e87f8acfdcea29..f5fa1ba5987f2cc40b55a9895bf55bd9b4cfe08c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+collectd (3.11.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Removed sensors-ignorelist.dpatch - has been merged upstream.
+  * Removed email-ignore-size-le-0.dpatch - has been merged upstream.
+  * Added watch file.
+
+ -- Sebastian Harl <sh@tokkee.org>  Mon, 12 Feb 2007 16:25:36 +0000
+
 collectd (3.11.0-1) experimental; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 4cb85cbf5451dc51578f36b64910851aaa276c60..9b1891128f184ae64c553f88a6416414fb642d96 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap-dev, dpatch
+Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap-dev
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.7.2
 

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index e83aa55..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-email-ignore-size-le-0.dpatch
-sensors-ignorelist.dpatch
-

diff --git a/debian/patches/email-ignore-size-le-0.dpatch b/debian/patches/email-ignore-size-le-0.dpatch
deleted file mode 100644 (file)
index 42430d5..0000000
--- a/debian/patches/email-ignore-size-le-0.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## email-ignore-size-le-0.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: email plugin: Ignore size if it less than or equal to zero.
-
-@DPATCH@
-
-diff -uN a/src/collectd.1 b/src/collectd.1
---- a/src/collectd.1
-+++ b/src/collectd.1
-@@ -271,6 +271,8 @@
- \&  e:<type>:<size>
- .Ve
- .PP
-+If \f(CW\*(C`size\*(C'\fR is less than or equal to zero, \f(CW\*(C`size\*(C'\fR is ignored.
-+.PP
- Spam score:
- .PP
- .Vb 1
-diff -uN a/src/email.c b/src/email.c
---- a/src/email.c
-+++ b/src/email.c
-@@ -486,9 +486,11 @@
-                               type_list_incr (&count, type, 1);
-                               pthread_mutex_unlock (&count_mutex);
- 
--                              pthread_mutex_lock (&size_mutex);
--                              type_list_incr (&size, type, bytes);
--                              pthread_mutex_unlock (&size_mutex);
-+                              if (bytes > 0) {
-+                                      pthread_mutex_lock (&size_mutex);
-+                                      type_list_incr (&size, type, bytes);
-+                                      pthread_mutex_unlock (&size_mutex);
-+                              }
-                       }
-                       else if ('s' == line[0]) { /* s:<value> */
-                               pthread_mutex_lock (&score_mutex);

diff --git a/debian/patches/sensors-ignorelist.dpatch b/debian/patches/sensors-ignorelist.dpatch
deleted file mode 100644 (file)
index ea059a1..0000000
--- a/debian/patches/sensors-ignorelist.dpatch
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## sensors-ignorelist.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: sensors plugin: Avoid assertion in ignorelist_match () when not
-## DP: configured.
-
-@DPATCH@
-
-diff -uN a/src/sensors.c b/src/sensors.c
---- a/src/sensors.c
-+++ b/src/sensors.c
-@@ -393,7 +393,8 @@
-       sensors_free_features ();
- #endif /* if SENSORS_HAVE_READ */
- 
--      ignorelist_free (sensor_list);
-+      if (NULL != sensor_list)
-+              ignorelist_free (sensor_list);
- }
- 
- static void sensors_voltage_write (char *host, char *inst, char *val)
-@@ -402,7 +403,7 @@
-       int status;
- 
-       /* skip ignored in our config */
--      if (ignorelist_match (sensor_list, inst))
-+      if ((NULL != sensor_list) && ignorelist_match (sensor_list, inst))
-               return;
- 
-       /* extended sensor naming */
-@@ -423,7 +424,7 @@
-       int status;
- 
-       /* skip ignored in our config */
--      if (ignorelist_match (sensor_list, inst))
-+      if ((NULL != sensor_list) && ignorelist_match (sensor_list, inst))
-               return;
- 
-       /* extended sensor naming */
-@@ -450,7 +451,7 @@
-               return;
- 
-       /* skip ignored in our config */
--      if (ignorelist_match (sensor_list, inst))
-+      if ((NULL != sensor_list) && ignorelist_match (sensor_list, inst))
-               return;
- 
-       if (snprintf (buf, BUFSIZE, "%u:%.3f", (unsigned int) curtime,

diff --git a/debian/rules b/debian/rules
index 4f927c6f998f8f1bdb855012186b896c4f1b9615..22a2b8562c9eaa45347a754ddae8f6b2b64d1ae7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,6 @@ else
        CFLAGS += -O2
 endif
 
-include /usr/share/dpatch/dpatch.make
-
 config.status: configure
        dh_testdir
        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
@@ -30,14 +28,14 @@ config.status: configure
 
 build: build-stamp
 
-build-stamp: config.status patch
+build-stamp: config.status
        dh_testdir
        
        $(MAKE)
        
        touch build-stamp
 
-clean: unpatch
+clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp