From cfe2cfe56d3ba29159743e402906e1875116135f Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Sun, 9 Jun 2013 11:52:47 +0200
Subject: [PATCH] hack the lens package to use a local rclconfig.py until the
 updated python package is released

---
 src/desktop/unity-lens-recoll/mkdist.sh               |  5 ++++-
 .../unity-lens-recoll/recollscope/rclsearch.py        | 11 ++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/desktop/unity-lens-recoll/mkdist.sh b/src/desktop/unity-lens-recoll/mkdist.sh
index 1b548f75..f43f96b0 100644
--- a/src/desktop/unity-lens-recoll/mkdist.sh
+++ b/src/desktop/unity-lens-recoll/mkdist.sh
@@ -21,7 +21,7 @@ targetdir=${targetdir-/tmp}
 
 checkmodified=${checkmodified-yes}
 
-editedfiles=`$VCCMD status . | egrep -v '^\?'`
+#editedfiles=`$VCCMD status . | egrep -v '^\?'`
 if test "$checkmodified" = "yes" -a ! -z "$editedfiles"; then
   fatal  "Edited files exist: " $editedfiles
 fi
@@ -45,6 +45,9 @@ yes | clean.O
 
 $TAR chfX - excludefile .  | (cd $topdir;$TAR xf -)
 
+# Temporary, until the released recoll python module includes rclconfig.py
+cp ../../python/recoll/recoll/rclconfig.py $topdir/recollscope
+
 out=$releasename.tar.gz
 (cd $targetdir ; \
     $TAR chf - $releasename | \
diff --git a/src/desktop/unity-lens-recoll/recollscope/rclsearch.py b/src/desktop/unity-lens-recoll/recollscope/rclsearch.py
index 2f3dec84..6d79ba08 100755
--- a/src/desktop/unity-lens-recoll/recollscope/rclsearch.py
+++ b/src/desktop/unity-lens-recoll/recollscope/rclsearch.py
@@ -13,7 +13,16 @@ try:
     hasrclconfig = True
 except:
     hasrclconfig = False
-
+# As a temporary measure, we also look for rclconfig as a bare
+# module. This is so that the intermediate releases of the lens can
+# ship and use rclconfig.py with the lens code
+if not hasrclconfig:
+    try:
+        import rclconfig
+        hasrclconfig = True
+    except:
+        pass
+    
 try:
     from recoll import recoll
     from recoll import rclextract