bug 3669

diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index d99ad66..225a4ab 100644 (file)
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -65,6 +65,9 @@ Source reorganisation:
 
 * oldsave, oldload functions (only used with macros of scilab 2.4) are removed
   Replaces oldsave, oldload by save and load in your code.
+  
+* bug 3669 fixed - integrate, intc and intl moved in Differential equations
+  interp1, interp2d and splin2d  moved in the Interpolation module.
 
 * libs/MALLOC/src/malloc.c is no longer build (used to be built for 64 
 bits archs). Note that if Scilab is built on a 64 bits and triggers a 

diff --git a/scilab/modules/differential_equations/help/en_US/addchapter.sce b/scilab/modules/differential_equations/help/en_US/addchapter.sce
index 0e5006f..5b09be6 100644 (file)
--- a/scilab/modules/differential_equations/help/en_US/addchapter.sce
+++ b/scilab/modules/differential_equations/help/en_US/addchapter.sce
@@ -7,5 +7,5 @@
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
-add_help_chapter("Differential Equations",SCI+"/modules/differential_equations/help/en_US",%T);
+add_help_chapter("Differential Equations, Integration",SCI+"/modules/differential_equations/help/en_US",%T);
 

diff --git a/scilab/modules/elementary_functions/help/en_US/intc.xml b/scilab/modules/differential_equations/help/en_US/intc.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/en_US/intc.xml
rename to scilab/modules/differential_equations/help/en_US/intc.xml

diff --git a/scilab/modules/elementary_functions/help/en_US/integrate.xml b/scilab/modules/differential_equations/help/en_US/integrate.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/en_US/integrate.xml
rename to scilab/modules/differential_equations/help/en_US/integrate.xml

diff --git a/scilab/modules/elementary_functions/help/en_US/intl.xml b/scilab/modules/differential_equations/help/en_US/intl.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/en_US/intl.xml
rename to scilab/modules/differential_equations/help/en_US/intl.xml

diff --git a/scilab/modules/elementary_functions/help/fr_FR/integrate.xml b/scilab/modules/differential_equations/help/fr_FR/integrate.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/fr_FR/integrate.xml
rename to scilab/modules/differential_equations/help/fr_FR/integrate.xml

diff --git a/scilab/modules/elementary_functions/help/pt_BR/intc.xml b/scilab/modules/differential_equations/help/pt_BR/intc.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/pt_BR/intc.xml
rename to scilab/modules/differential_equations/help/pt_BR/intc.xml

diff --git a/scilab/modules/elementary_functions/help/pt_BR/integrate.xml b/scilab/modules/differential_equations/help/pt_BR/integrate.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/pt_BR/integrate.xml
rename to scilab/modules/differential_equations/help/pt_BR/integrate.xml

diff --git a/scilab/modules/elementary_functions/help/pt_BR/intl.xml b/scilab/modules/differential_equations/help/pt_BR/intl.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/pt_BR/intl.xml
rename to scilab/modules/differential_equations/help/pt_BR/intl.xml

diff --git a/scilab/modules/elementary_functions/macros/intc.sci b/scilab/modules/differential_equations/macros/intc.sci
similarity index 100%
rename from scilab/modules/elementary_functions/macros/intc.sci
rename to scilab/modules/differential_equations/macros/intc.sci

diff --git a/scilab/modules/elementary_functions/macros/integrate.sci b/scilab/modules/differential_equations/macros/integrate.sci
similarity index 100%
rename from scilab/modules/elementary_functions/macros/integrate.sci
rename to scilab/modules/differential_equations/macros/integrate.sci

diff --git a/scilab/modules/elementary_functions/macros/intl.sci b/scilab/modules/differential_equations/macros/intl.sci
similarity index 100%
rename from scilab/modules/elementary_functions/macros/intl.sci
rename to scilab/modules/differential_equations/macros/intl.sci

diff --git a/scilab/modules/elementary_functions/tests/unit_tests/integrate.dia.ref b/scilab/modules/differential_equations/tests/unit_tests/integrate.dia.ref
similarity index 100%
rename from scilab/modules/elementary_functions/tests/unit_tests/integrate.dia.ref
rename to scilab/modules/differential_equations/tests/unit_tests/integrate.dia.ref

diff --git a/scilab/modules/elementary_functions/tests/unit_tests/integrate.tst b/scilab/modules/differential_equations/tests/unit_tests/integrate.tst
similarity index 100%
rename from scilab/modules/elementary_functions/tests/unit_tests/integrate.tst
rename to scilab/modules/differential_equations/tests/unit_tests/integrate.tst

diff --git a/scilab/modules/elementary_functions/help/en_US/interp1.xml b/scilab/modules/interpolation/help/en_US/interp1.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/en_US/interp1.xml
rename to scilab/modules/interpolation/help/en_US/interp1.xml

diff --git a/scilab/modules/elementary_functions/help/en_US/interp2d.xml b/scilab/modules/interpolation/help/en_US/interp2d.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/en_US/interp2d.xml
rename to scilab/modules/interpolation/help/en_US/interp2d.xml

diff --git a/scilab/modules/elementary_functions/help/en_US/splin2d.xml b/scilab/modules/interpolation/help/en_US/splin2d.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/en_US/splin2d.xml
rename to scilab/modules/interpolation/help/en_US/splin2d.xml

diff --git a/scilab/modules/elementary_functions/help/mml/splin2d_equation_1.mml b/scilab/modules/interpolation/help/mml/splin2d_equation_1.mml
similarity index 100%
rename from scilab/modules/elementary_functions/help/mml/splin2d_equation_1.mml
rename to scilab/modules/interpolation/help/mml/splin2d_equation_1.mml

diff --git a/scilab/modules/elementary_functions/help/pt_BR/interp1.xml b/scilab/modules/interpolation/help/pt_BR/interp1.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/pt_BR/interp1.xml
rename to scilab/modules/interpolation/help/pt_BR/interp1.xml

diff --git a/scilab/modules/elementary_functions/help/pt_BR/interp2d.xml b/scilab/modules/interpolation/help/pt_BR/interp2d.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/pt_BR/interp2d.xml
rename to scilab/modules/interpolation/help/pt_BR/interp2d.xml

diff --git a/scilab/modules/elementary_functions/help/pt_BR/splin2d.xml b/scilab/modules/interpolation/help/pt_BR/splin2d.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/pt_BR/splin2d.xml
rename to scilab/modules/interpolation/help/pt_BR/splin2d.xml

diff --git a/scilab/modules/elementary_functions/macros/interp1.sci b/scilab/modules/interpolation/macros/interp1.sci
similarity index 100%
rename from scilab/modules/elementary_functions/macros/interp1.sci
rename to scilab/modules/interpolation/macros/interp1.sci