Switching main version to new release version

diff --git a/doc/en/conf.py b/doc/en/conf.py
index d7795411ad01d221648583228ff5befe91115332..016f110b5eb970955d9acbcf5d6f16c88b9024bc 100644 (file)
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -68,12 +68,10 @@ copyright = u'2008-2014, Jean-Philippe ARGAUD'
 #
 # The short X.Y version.
 # version = '7\_main'
-# version = '7.4.0'
-version = '%s'%module_version.version.replace('_','\_')
+version = '%s'%module_version.version.replace('_','.')
 # The full version, including alpha/beta/rc tags.
 # release = '7\_main'
-# release = '7.4.0'
-release = '%s'%module_version.version.replace('_','\_')
+release = '%s'%module_version.version.replace('_','.')
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -129,7 +127,7 @@ html_theme = 'default'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = "Documentation %s %s"%(module_version.name,module_version.version)
+html_title = "Documentation %s %s"%(module_version.name,module_version.version.replace('_','.'))
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None

diff --git a/doc/fr/conf.py b/doc/fr/conf.py
index 86c83d48c8bfc994d9a8f0bf8b50950e0b055068..401cb648d863187da3cafa28f71895ec01376ca2 100644 (file)
--- a/doc/fr/conf.py
+++ b/doc/fr/conf.py
@@ -68,12 +68,10 @@ copyright = u'2008-2014, Jean-Philippe ARGAUD'
 #
 # The short X.Y version.
 # version = '7\_main'
-# version = '7.4.0'
-version = '%s'%module_version.version.replace('_','\_')
+version = '%s'%module_version.version.replace('_','.')
 # The full version, including alpha/beta/rc tags.
 # release = '7\_main'
-# release = '7.4.0'
-release = '%s'%module_version.version.replace('_','\_')
+release = '%s'%module_version.version.replace('_','.')
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -129,7 +127,7 @@ html_theme = 'default'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = "Documentation %s %s"%(module_version.name,module_version.version)
+html_title = "Documentation %s %s"%(module_version.name,module_version.version.replace('_','.'))
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 082807be266611acd5a3b0557a733e136824f46d..3d167e844bf85ca5af81c160efad703047bd08aa 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -26,15 +26,15 @@
     <parameter name="icon"          value="ADAO.png"/>
     <parameter name="library"       value="SalomePyQtGUI"/>
     <parameter name="documentation" value="adao_help"/>
-    <parameter name="version"       value="7.4.0"/>
+    <parameter name="version"       value="7.5.0"/>
   </section>
   <section name="resources">
     <!-- Module resources -->
     <parameter name="ADAO" value="${ADAO_ROOT_DIR}/share/salome/resources/adao"/>
   </section>
   <section name="adao_help">
-    <parameter name="sub_menu"     value="%1 module"/>
-    <parameter name="(EN) User's Guide" value="${ADAO_ROOT_DIR}/share/doc/salome/gui/ADAO/en/index.html"/>
+    <parameter name="sub_menu"                    value="%1 module"/>
+    <parameter name="(EN) User's Guide"           value="${ADAO_ROOT_DIR}/share/doc/salome/gui/ADAO/en/index.html"/>
     <parameter name="(FR) Guide de l'utilisateur" value="${ADAO_ROOT_DIR}/share/doc/salome/gui/ADAO/fr/index.html"/>
   </section>
 </document>

diff --git a/src/daComposant/daCore/version.py b/src/daComposant/daCore/version.py
index eedd25588d2a2245aa0d8607621c2952528673c3..859cbdba22d4c9fcf8712601f3bd5e8fcc04933f 100644 (file)
--- a/src/daComposant/daCore/version.py
+++ b/src/daComposant/daCore/version.py
@@ -21,5 +21,5 @@
 #  Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 
 name    = "Data Assimilation Package"
-version = "0.9.0"
-date    = "mercredi 30 avril 2014, 12:12:12 (UTC+0100)"
+version = "0.10.0"
+date    = "mardi 30 septembre 2014, 12:12:12 (UTC+0100)"