From 005b29ef0ded7b82be388b000a861788fb04c782 Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Tue, 27 Dec 2005 15:07:57 +0000
Subject: [PATCH] Join modifications from branch BR_3_1_0deb

---
 INSTALL                        |  6 +++---
 bin/VERSION                    |  2 +-
 build_configure                |  2 +-
 resources/COMPONENTCatalog.xml | 26 +++++++++++++-------------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/INSTALL b/INSTALL
index 36d8043..b49df5e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-This is the version 3.1.0b1 of COMPONENT
+This is the version 3.1.0 of COMPONENT
 Compatible with :
-	- KERNEL 3.1.0b1
-	- SALOMEGUI 3.1.0b1
+	- KERNEL 3.1.0
+	- SALOMEGUI 3.1.0
diff --git a/bin/VERSION b/bin/VERSION
index 0864bcc..e142830 100755
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - COMPONENT VERSION: 3.1.0b1
+THIS IS SALOME - COMPONENT VERSION: 3.1.0
diff --git a/build_configure b/build_configure
index eb80d89..6ae0a34 100755
--- a/build_configure
+++ b/build_configure
@@ -109,7 +109,7 @@ fi
 
 # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in  files
 echo "" >> configure.in_tmp1
-echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
+echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
 
 echo  "" >> configure.in_tmp1
 echo "AC_OUTPUT([ \\" >> configure.in_tmp1
diff --git a/resources/COMPONENTCatalog.xml b/resources/COMPONENTCatalog.xml
index 6af7f57..3369232 100644
--- a/resources/COMPONENTCatalog.xml
+++ b/resources/COMPONENTCatalog.xml
@@ -16,7 +16,7 @@
 		<component-username>AddComponent</component-username>
 		<component-type>SuperVisionTest</component-type>
 		<component-author>MTJ</component-author>
-		<component-version>3.1.0b1</component-version>
+		<component-version>3.1.0</component-version>
 		<component-comment>SuperVision test: Addition</component-comment>
 		<component-multistudy>0</component-multistudy>
 
@@ -478,7 +478,7 @@
 		<component-username>AdditionComponent</component-username>
 		<component-type>SuperVisionTest</component-type>
 		<component-author>JR</component-author>
-		<component-version>3.1.0b1</component-version>
+		<component-version>3.1.0</component-version>
 		<component-comment>SuperVision test: Addition</component-comment>
 		<component-multistudy>0</component-multistudy>
 
@@ -940,7 +940,7 @@
 		<component-username>SubComponent</component-username>
 		<component-type>SuperVisionTest</component-type>
 		<component-author>MTJ</component-author>
-		<component-version>3.1.0b1</component-version>
+		<component-version>3.1.0</component-version>
 		<component-comment>SuperVision test: Subtraction</component-comment>
 		<component-multistudy>0</component-multistudy>
 
@@ -987,7 +987,7 @@
 		<component-username>MulComponent</component-username>
 		<component-type>SuperVisionTest</component-type>
 		<component-author>MTJ</component-author>
-		<component-version>3.1.0b1</component-version>
+		<component-version>3.1.0</component-version>
 		<component-comment>SuperVision test: Multiplication</component-comment>
 		<component-multistudy>0</component-multistudy>
 
@@ -1034,7 +1034,7 @@
 		<component-username>DivComponent</component-username>
 		<component-type>SuperVisionTest</component-type>
 		<component-author>MTJ</component-author>
-		<component-version>3.1.0b1</component-version>
+		<component-version>3.1.0</component-version>
 		<component-comment>SuperVision test: Division</component-comment>
 		<component-multistudy>0</component-multistudy>
 
@@ -1080,7 +1080,7 @@
 		<component-username>SyrComponent</component-username>
 		<component-type>SuperVisionTest</component-type>
 		<component-author>JR</component-author>
-		<component-version>3.1.0b1</component-version>
+		<component-version>3.1.0</component-version>
 		<component-comment>SuperVision test</component-comment>
 		<component-multistudy>1</component-multistudy>
 		<component-icone></component-icone>
@@ -1523,7 +1523,7 @@
 		<component-username>FactorialComponent</component-username>
 		<component-type>SuperVisionTest</component-type>
 		<component-author>Malvagi, Tajchman</component-author>
-		<component-version>3.1.0b1</component-version>
+		<component-version>3.1.0</component-version>
 		<component-comment>SuperVision test: Factorial</component-comment>
 		<component-multistudy>0</component-multistudy>
 		<component-icone></component-icone>
@@ -1586,7 +1586,7 @@
 		<component-username>SyrControlComponent</component-username>
 		<component-type>SuperVisionTest</component-type>
 		<component-author>JR</component-author>
-		<component-version>3.1.0b1</component-version>
+		<component-version>3.1.0</component-version>
 		<component-comment>SuperVision test</component-comment>
 		<component-multistudy>1</component-multistudy>
 		<component-icone></component-icone>
@@ -1815,7 +1815,7 @@
 		<component-username>TypesCheck</component-username>
 		<component-type></component-type>
 		<component-author></component-author>
-		<component-version>3.1.0b1</component-version>
+		<component-version>3.1.0</component-version>
 		<component-comment>SuperVision test</component-comment>
 		<component-multistudy>1</component-multistudy>
 		<component-icone></component-icone>
@@ -2094,7 +2094,7 @@
 		<component-username>Calculator</component-username>
 		<component-type>SOLVER</component-type>
 		<component-author>LD</component-author>
-		<component-version>3.1.0b1</component-version>
+		<component-version>3.1.0</component-version>
 		<component-comment>SuperVision test: Arithmetic operations with MED_Field</component-comment>
 		<component-multistudy>0</component-multistudy>
 		<constraint>hostname = localhost</constraint>
@@ -2245,7 +2245,7 @@
             <component-username>DataStreamFactory</component-username>
             <component-type>OTHER</component-type>
             <component-author>jr</component-author>
-            <component-version>3.1.0b1</component-version>
+            <component-version>3.1.0</component-version>
             <component-comment>SuperVision test</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-icone></component-icone>
@@ -2724,7 +2724,7 @@
             <component-username>SIGNALSComponent</component-username>
             <component-type>OTHER</component-type>
             <component-author>jr</component-author>
-            <component-version>3.1.0b1</component-version>
+            <component-version>3.1.0</component-version>
             <component-comment>unknown</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-icone></component-icone>
@@ -2784,7 +2784,7 @@
             <component-username>UndefinedSymbolComponent</component-username>
             <component-type>OTHER</component-type>
             <component-author>jr</component-author>
-            <component-version>3.1.0a</component-version>
+            <component-version>3.1.0</component-version>
             <component-comment>unknown</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-icone></component-icone>
-- 
2.39.2