debian/patches: remove configure_find_lc_all.patch

diff --git a/debian/changelog b/debian/changelog
index 21841e6a644fc3a0e3ed9ce2f130bfe7bb2a9434..955300f3f152baa0cb9205fab68fb7f39b32ff20 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ collectd (5.7.0-1) UNRELEASED; urgency=medium
     - Build-depend on libdpdk-dev: Needed by the new dpdkstat plugin.
     - Build-depend on libmicrohttpd-dev: Needed by the new write_prometheus
       plugin.
+  * debian/patches:
+    Removed configure_find_lc_all.patch; included upstream.
 
  -- Marc Fournier <marc@bl.uem.li>  Tue, 13 Dec 2016 21:27:06 +0100
 

diff --git a/debian/patches/configure_find_lc_all.patch b/debian/patches/configure_find_lc_all.patch
deleted file mode 100644 (file)
index f223673..0000000
--- a/debian/patches/configure_find_lc_all.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: set locale when running find, to ensure a reproducible sort order
-Author: Marc Fournier <marc@bl.uem.li>
-diff --git a/configure.ac b/configure.ac
-index ceb0b30..2d05efa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2258,7 +2258,7 @@ then
-       if test -d "$with_java_home"
-       then
-               AC_MSG_CHECKING([for jni.h])
--              TMPVAR=`find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
-+              TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | sort | head -n 1`
-               if test "x$TMPVAR" != "x"
-               then
-                       AC_MSG_RESULT([found in $TMPVAR])
-@@ -2268,7 +2268,7 @@ then
-               fi
- 
-               AC_MSG_CHECKING([for jni_md.h])
--              TMPVAR=`find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
-+              TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' 2>/dev/null | sort | head -n 1`
-               if test "x$TMPVAR" != "x"
-               then
-                       AC_MSG_RESULT([found in $TMPVAR])
-@@ -2278,7 +2278,7 @@ then
-               fi
- 
-               AC_MSG_CHECKING([for libjvm.so])
--              TMPVAR=`find -L "$with_java_home" -type f \( -name libjvm.so -o -name libjvm.dylib \) -exec 'dirname' '{}' ';' 2>/dev/null | head -n 1`
-+              TMPVAR=`LC_ALL=C find -L "$with_java_home" -type f \( -name libjvm.so -o -name libjvm.dylib \) -exec 'dirname' '{}' ';' 2>/dev/null | sort | head -n 1`
-               if test "x$TMPVAR" != "x"
-               then
-                       AC_MSG_RESULT([found in $TMPVAR])
-@@ -2290,7 +2290,7 @@ then
-               if test "x$JAVAC" = "x"
-               then
-                       AC_MSG_CHECKING([for javac])
--                      TMPVAR=`find -L "$with_java_home" -name javac -type f 2>/dev/null | head -n 1`
-+                      TMPVAR=`LC_ALL=C find -L "$with_java_home" -name javac -type f 2>/dev/null | sort | head -n 1`
-                       if test "x$TMPVAR" != "x"
-                       then
-                               JAVAC="$TMPVAR"
-@@ -2302,7 +2302,7 @@ then
-               if test "x$JAR" = "x"
-               then
-                       AC_MSG_CHECKING([for jar])
--                      TMPVAR=`find -L "$with_java_home" -name jar -type f 2>/dev/null | head -n 1`
-+                      TMPVAR=`LC_ALL=C find -L "$with_java_home" -name jar -type f 2>/dev/null | sort | head -n 1`
-                       if test "x$TMPVAR" != "x"
-                       then
-                               JAR="$TMPVAR"

diff --git a/debian/patches/series b/debian/patches/series
index 7039a9de9782c5c1ab419cc008f6db2d77b543fe..5e9e15a6b55248a10a406eaf960766283ff29e20 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-configure_find_lc_all.patch
 rrd_filter_path.patch
 collection_conf_path.patch
 myplugin_includes.patch