From 152181123e12a8d37bec7fa1c2e49cfac3bb1773 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Wed, 28 Sep 2011 15:32:36 +0200
Subject: [PATCH] rcllyx: fixed lyx version number test for lyx 2.0

---
 src/filters/rcllyx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/filters/rcllyx b/src/filters/rcllyx
index 93119500..0a9ce9af 100755
--- a/src/filters/rcllyx
+++ b/src/filters/rcllyx
@@ -146,10 +146,15 @@ lyx --export text "$lyxfile" || senderror "lyx --export not working"
 LYXOUTPUTUTF=No
 vline=`lyx --version 2>&1 | head -1 | tr '.' ' '`
 set $vline
-maj=`expr $2 '*' 10000` || senderror "Bad lyx version string $vline"
-med=`expr $3 '*' 100` || senderror "Bad lyx version string $vline"
-min=`expr $4 '*' 1` || senderror "Bad lyx version string $vline"
+for i in $2 $3 $4;do
+    expr "$i" ':' '[0-9][0-9]*' > /dev/null || \
+        senderror "Bad lyx version string $vline"
+done
+maj=`expr $2 '*' 10000`
+med=`expr $3 '*' 100` 
+min=`expr $4 '*' 1` 
 version=`expr $maj + $med + $min` || senderror "Bad lyx version string $vline"
+
 if test $version -ge 10607 ; then
   LYXOUTPUTUTF=Yes
 fi