From 43087b78e98e2164a532649afda678cd8ac4b499 Mon Sep 17 00:00:00 2001
From: barate <barate>
Date: Thu, 12 Dec 2013 09:44:24 +0000
Subject: [PATCH] Fix JOBMANAGER version

---
 doc/conf.py.in                           | 4 ++--
 src/salomegui/resources/SalomeApp.xml.in | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/conf.py.in b/doc/conf.py.in
index 8e2a17a..c6767fd 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -46,9 +46,9 @@ copyright = '2010-2013 CEA/DEN, EDF R&D, A. Ribes'
 # built documents.
 #
 # The short X.Y version.
-version = '@SHORT_VERSION@'
+version = '@SALOMEJOBMANAGER_MAJOR_VERSION@.@SALOMEJOBMANAGER_MINOR_VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '@VERSION@'
+release = '@SALOMEJOBMANAGER_VERSION@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/src/salomegui/resources/SalomeApp.xml.in b/src/salomegui/resources/SalomeApp.xml.in
index c6376d4..6a3504e 100644
--- a/src/salomegui/resources/SalomeApp.xml.in
+++ b/src/salomegui/resources/SalomeApp.xml.in
@@ -24,7 +24,7 @@
     <parameter name="name" value="JobManager"/>
     <parameter name="icon" value="jobmanager.png"/>
     <parameter name="documentation" value="jobmanager_help"/>
-    <parameter name="version" value="@VERSION@"/>
+    <parameter name="version" value="@SALOMEJOBMANAGER_VERSION@"/>
   </section>
   <section name="resources">
     <!-- Module resources -->
-- 
2.30.2