patches: Removed libcollectdclient_static_sstrerror.dpatch.

This patch has been included upstream.

diff --git a/debian/changelog b/debian/changelog
index 29c197c9ce90a840f21622807011edc7bfb644e0..7d492ef8df0709c3364e3fa57e3a3a0bd28c3a7f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,10 @@ collectd (4.7.2-1) unstable; urgency=low
     - Build-depend on libgcrypt11-dev, used by the network plugin.
   * debian/collectd.install:
     - Install collectd-java.5.
+  * debian/patches:
+    - Removed libcollectdclient_static_sstrerror.dpatch - included upstream.
 
- -- Sebastian Harl <tokkee@debian.org>  Thu, 23 Jul 2009 22:57:36 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 23 Jul 2009 23:01:48 +0200
 
 collectd (4.6.3-1) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index eb3c26b1bac22ee8da84528c2d25be9481683487..332b35c8333c22b54c6ead8e9d0f6750c3bfbc7f 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
-libcollectdclient_static_sstrerror.dpatch
 

diff --git a/debian/patches/libcollectdclient_static_sstrerror.dpatch b/debian/patches/libcollectdclient_static_sstrerror.dpatch
deleted file mode 100755 (executable)
index e638089..0000000
--- a/debian/patches/libcollectdclient_static_sstrerror.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## libcollectdclient_static_sstrerror.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: libcollectdclient/client.c: Made sstrerror() static.
-## DP:
-## DP: This is a private helper function only.
-
-@DPATCH@
-
-diff a/src/libcollectdclient/client.c b/src/libcollectdclient/client.c
---- a/src/libcollectdclient/client.c
-+++ b/src/libcollectdclient/client.c
-@@ -121,7 +121,7 @@ typedef struct lcc_response_s lcc_response_t;
- /* Even though Posix requires "strerror_r" to return an "int",
-  * some systems (e.g. the GNU libc) return a "char *" _and_
-  * ignore the second argument ... -tokkee */
--char *sstrerror (int errnum, char *buf, size_t buflen)
-+static char *sstrerror (int errnum, char *buf, size_t buflen)
- {
-   buf[0] = 0;
-