From: Jean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Date: Fri, 22 Nov 2013 11:55:40 +0000 (+0100)
Subject: Switching main version to new release version
X-Git-Tag: V7_3_0~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5b57df24cba2b97332db760c6ed363a579ea05ee;p=modules%2Fadao.git

Switching main version to new release version
---

diff --git a/doc/en/advanced.rst b/doc/en/advanced.rst
index 4fabcaa..fd6fc0c 100644
--- a/doc/en/advanced.rst
+++ b/doc/en/advanced.rst
@@ -178,6 +178,13 @@ is not guaranteed for all the commands or keywords. In general also, an ADAO
 case file for one version can not be read by a previous minor or major version
 of the ADAO module.
 
+Switching from 7.2 to 7.3
++++++++++++++++++++++++++
+
+There is no known incompatibility for the ADAO case files. The upgrade procedure
+is to read the old ADAO case file with the new SALOME/ADAO module, and save it
+with a new name.
+
 Switching from 6.6 to 7.2
 +++++++++++++++++++++++++
 
diff --git a/doc/en/conf.py b/doc/en/conf.py
index 9b4336f..4550d14 100644
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -65,11 +65,11 @@ copyright = u'2008-2013, Jean-Philippe ARGAUD'
 # built documents.
 #
 # The short X.Y version.
-version = '7.2.0'
 version = '7\_main'
+version = '7.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '7.2.0'
 release = '7\_main'
+release = '7.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/fr/advanced.rst b/doc/fr/advanced.rst
index 8a4b62f..d48029e 100644
--- a/doc/fr/advanced.rst
+++ b/doc/fr/advanced.rst
@@ -190,6 +190,13 @@ commandes ou tous les mots-cl
 version ne peut pas être lu par une précédente version mineure ou majeure du
 module ADAO.
 
+Passer de la version 7.2 à la 7.3
++++++++++++++++++++++++++++++++++
+
+Il n'y a pas d'incompatibilité connue pour les fichiers de cas ADAO. La
+procédure de montée en version consiste à lire l'ancien fichier de cas ADAO avec
+le nouveau module SALOME/ADAO, et de l'enregistrer avec un nouveau nom.
+
 Passer de la version 6.6 à la 7.2
 +++++++++++++++++++++++++++++++++
 
diff --git a/doc/fr/conf.py b/doc/fr/conf.py
index 90eb8cb..c377cc7 100644
--- a/doc/fr/conf.py
+++ b/doc/fr/conf.py
@@ -65,11 +65,11 @@ copyright = u'2008-2013, Jean-Philippe ARGAUD'
 # built documents.
 #
 # The short X.Y version.
-version = '7.2.0'
 version = '7\_main'
+version = '7.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '7.2.0'
 release = '7\_main'
+release = '7.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 4b62768..edf827a 100644
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -26,7 +26,7 @@
     <parameter name="icon"          value="ADAO.png"/>
     <parameter name="library"       value="SalomePyQtGUI"/>
     <parameter name="documentation" value="adao_help"/>
-    <parameter name="version"       value="7_main"/>
+    <parameter name="version"       value="7.3.0"/>
   </section>
   <section name="resources">
     <!-- Module resources -->
diff --git a/src/daComposant/daCore/version.py b/src/daComposant/daCore/version.py
index e3f6a93..965d366 100644
--- a/src/daComposant/daCore/version.py
+++ b/src/daComposant/daCore/version.py
@@ -22,4 +22,4 @@
 
 name    = "Data Assimilation Package"
 version = "0.8.0"
-date    = "jeudi 31 octobre 2013, 12:12:12 (UTC+0100)"
+date    = "jeudi 30 novembre 2013, 12:12:12 (UTC+0100)"