From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 25 Sep 2009 11:12:23 +0000 (+0200)
Subject: patches: Removed bts494874-gnu-kfreebsd - included upstream.
X-Git-Tag: experimental/1.4--rc2+20091004~39
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=618f2bc62a0e8b4c427f58e197885123f69c3fe3;p=pkg-rrdtool.git

patches: Removed bts494874-gnu-kfreebsd - included upstream.
---

diff --git a/debian/changelog b/debian/changelog
index f9be5c4..da7e184 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ rrdtool (1.4~rc2-1) experimental; urgency=low
   * debian/rules:
     - Remove config.h in the 'clean' target - this is created by configure but
       not cleaned up by any Makefile.
+  * debian/patches:
+    - Removed bts494874-gnu-kfreebsd - included upstream.
 
- -- Sebastian Harl <tokkee@debian.org>  Fri, 25 Sep 2009 13:08:48 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Fri, 25 Sep 2009 13:11:46 +0200
 
 rrdtool (1.3.8-1) unstable; urgency=low
 
diff --git a/debian/patches/bts494874-gnu-kfreebsd b/debian/patches/bts494874-gnu-kfreebsd
deleted file mode 100644
index 0ac6e18..0000000
--- a/debian/patches/bts494874-gnu-kfreebsd
+++ /dev/null
@@ -1,24 +0,0 @@
-diff a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -289,7 +289,7 @@ if test "x$acx_pthread_ok" = xyes; then
-         case "${host_cpu}-${host_os}" in
-             *-aix* | *-freebsd* | *-darwin*) x_rflag="-D_THREAD_SAFE";;
-             *solaris* | *-osf* | *-hpux*) x_rflag="-D_REENTRANT";;
--            *-linux*)
-+            *-linux*|*-k*bsd*-gnu*|*-gnu*)
-             if test x"$PTHREAD_CFLAGS" = "x-pthread"; then
-                 # For Linux/gcc "-pthread" implies "-lpthread". We need, however, to make this explicit
-                 # in PTHREAD_LIBS such that a shared library to be built properly depends on libpthread.
-diff a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -28428,7 +28428,7 @@ echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_
-         case "${host_cpu}-${host_os}" in
-             *-aix* | *-freebsd* | *-darwin*) x_rflag="-D_THREAD_SAFE";;
-             *solaris* | *-osf* | *-hpux*) x_rflag="-D_REENTRANT";;
--            *-linux*)
-+            *-linux*|*-k*bsd*-gnu*|*-gnu*)
-             if test x"$PTHREAD_CFLAGS" = "x-pthread"; then
-                 # For Linux/gcc "-pthread" implies "-lpthread". We need, however, to make this explicit
-                 # in PTHREAD_LIBS such that a shared library to be built properly depends on libpthread.
diff --git a/debian/patches/series b/debian/patches/series
index 93f905b..3d450d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-bts494874-gnu-kfreebsd
 bts428778-floating-point-exception
 setup.py-module-name
 no-rpath-for-ruby