[cpl-plugin-fors] 33/40: Replace remaining "esopipe" directory references

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-fors.

commit ae8f8b29e26d4de0683290330c604878ea805c2a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 18 18:21:47 2013 +0200

    Replace remaining "esopipe" directory references
---
 debian/patches/set_plugindir.patch |   43 ++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index f6e6b21..a6a4698 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -11,6 +11,38 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
      fi
  
      if test -z "$privatelibdir"; then
+@@ -113,7 +113,7 @@
+     fi
+ 
+     if test -z "$pipedocsdir"; then
+-        pipedocsdir='${datadir}/doc/esopipes/${PACKAGE}-${VERSION}/'
++        pipedocsdir='${datadir}/doc/${PACKAGE}-${VERSION}/'
+     fi
+ 
+     htmldir='${pipedocsdir}/html'
+@@ -123,11 +123,11 @@
+ #    fi
+ 
+     if test -z "$configdir"; then
+-       configdir='${prefix}/share/esopipes/${PACKAGE}-${VERSION}/config'
++       configdir='${prefix}/share/cpl-plugins/${PACKAGE}-${VERSION}/config'
+     fi
+ 
+     if test -z "$wkfextradir"; then
+-        wkfextradir='${datadir}/esopipes/${PACKAGE}-${VERSION}/reflex'
++        wkfextradir='${datadir}/cpl-plugins/${PACKAGE}-${VERSION}/reflex'
+     fi
+ 
+     if test -z "$wkfcopydir"; then
+@@ -149,7 +149,7 @@
+ #    AC_DEFINE_UNQUOTED(FORS_PLUGIN_DIR, "${PACKAGE}/plugins",
+ #                       [Plugin directory tree prefix])
+ 
+-    AC_DEFINE_UNQUOTED(FORS_PLUGIN_DIR,"esopipes-plugins", 
++    AC_DEFINE_UNQUOTED(FORS_PLUGIN_DIR,"cpl/plugins",
+                        [Plugin directory tree prefix])
+ 
+     eval plugin_dir="$plugindir"
 @@ -162,7 +162,7 @@
      # Define the preprocessor symbols for the sextractor executable
      # and the configuration files.
@@ -20,3 +52,14 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
  
      AC_DEFINE_UNQUOTED(FORS_SEXTRACTOR_PATH, "$sext_bindir",
                         [Absolute path to the sextractor executable])
+--- a/reflex/ForsSpec.xml.in
++++ b/reflex/ForsSpec.xml.in
+@@ -3362,7 +3362,7 @@
+     </entity>
+     <entity name="DataOrganizer" class="org.eso.DataOrganizer">
+         <display name="Data Organiser"/>
+-        <property name="OCA File" class="ptolemy.data.expr.FileParameter" value="@prefix@/share/esopipes/fors- at VERSION@/reflex/fors_spec_wkf.oca">
++        <property name="OCA File" class="ptolemy.data.expr.FileParameter" value="@prefix@/share/cpl-plugins/fors- at VERSION@/reflex/fors_spec_wkf.oca">
+         </property>
+         <property name="Keywords to be displayed" class="ptolemy.data.expr.StringParameter" value="OBS.TARG.NAME,INS.GRIS1.NAME,INS.FILT1.NAME,INS.MASK.ID,INS.MOS.CHECKSUM,INS.SLIT.NAME,DET.CHIP1.ID,DET.WIN1.BINX,DET.WIN1.BINY,INS.MODE">
+         </property>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-fors.git