[SCM] Execution Tool for European Southern Observatory pipelines branch, debian, updated. upstream/3.9.0-38-ga0d4bbb

[Ole Streicher]

The following commit has been merged in the debian branch:
commit a0d4bbb9c0cd0601df7f0912f3c3b263101e86b2
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Apr 8 13:16:21 2013 +0200

    Correct default plugin path. Closes: #704752

diff --git a/debian/changelog b/debian/changelog
index 3286bac..b3c875e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-esorex (3.10-1~exp1) UNRELEASED; urgency=low
+esorex (3.10-1~exp2) experimental; urgency=low
+
+  * Correct default plugin path. Closes: #704752
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 08 Apr 2013 13:14:35 +0200
+
+esorex (3.10-1~exp1) experimental; urgency=low
 
   * New upstream version
 
diff --git a/debian/patches/set-default-plugin-path.patch b/debian/patches/set-default-plugin-path.patch
index 481946a..1289bed 100644
--- a/debian/patches/set-default-plugin-path.patch
+++ b/debian/patches/set-default-plugin-path.patch
@@ -8,7 +8,21 @@ Description: Set the default plugin path to the one where recipes are
  # starting paths with colons (:). This option may also be set using the
  # environment variable ESOREX_PLUGIN_DIR.
 -esorex.caller.recipe-dir=@recipedir@/esopipes-plugins
-+esorex.caller.recipe-dir=@exec_prefix@/lib/@build_alias@/cpl/plugins:@exec_prefix@/lib/cpl/plugins
++esorex.caller.recipe-dir=@recipedir@
  
  # --suppress-link
  # When TRUE, no symbolic link is created to the output product. However, if
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -35,7 +35,10 @@
+     AC_SUBST(configdir)
+ 
+     if test -z "$recipedir"; then
+-	    recipedir="`eval echo $libdir`"
++       	    recipedir="`eval echo $libdir`/cpl/plugins"
++       	    if test $libdir != "/usr/lib"; then
++                recipedir="$recipedir:/usr/lib/cpl/plugins"
++            fi
+ 	fi
+ 	AC_SUBST(recipedir)
+ 

-- 
Execution Tool for European Southern Observatory pipelines