From 86478c981bf4a732a79693b2d02e35b16dd944ca Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 21 Nov 2014 13:28:39 +0100 Subject: [PATCH] MT#9617 Revert "MT#9617 Adjust Makefile.am for inclusion of SphinxSearchDaemon" This reverts commit 7a544ad6198a5df2d7613e98e94602c61cc4b9cf. The change from this patch will become part of sipwise-debian-changes.patch --- .../patches/SphinxSearchDaemon.install.patch | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/debian/patches/SphinxSearchDaemon.install.patch b/debian/patches/SphinxSearchDaemon.install.patch index d9e7ce6..113389f 100644 --- a/debian/patches/SphinxSearchDaemon.install.patch +++ b/debian/patches/SphinxSearchDaemon.install.patch @@ -14,19 +14,11 @@ attached the simply patch file and please confirm. Cc: DAIKI MATSUDA Signed-off-by: Simon Horman ---- a/resources/OCF/Makefile.am -+++ b/resources/OCF/Makefile.am -@@ -76,6 +76,7 @@ - SAPInstance \ - SendArp \ - ServeRAID \ -+ SphinxSearchDaemon \ - Stateful \ - SysInfo \ - tomcat \ ---- a/resources/OCF/Makefile.in -+++ b/resources/OCF/Makefile.in -@@ -415,6 +415,7 @@ +Index: heartbeat/resources/OCF/Makefile.am +=================================================================== +--- heartbeat.orig/resources/OCF/Makefile.am 2007-11-30 16:15:19.000000000 +0900 ++++ heartbeat/resources/OCF/Makefile.am 2008-01-08 13:16:50.000000000 +0900 +@@ -76,6 +76,7 @@ ocf_SCRIPTS = ClusterMon \ SAPInstance \ SendArp \ ServeRAID \