Fixed the build following license changes 39/17739/1
Francois Granade [Thu, 28 Jan 2016 07:29:34 +0000 (08:29 +0100)]
Change-Id: Ifa6addf09b5df72d5576664aad2b9f1255962216

scilab/Makefile.am
scilab/Makefile.in
scilab/modules/hdf5/tests/unit_tests/h5open.dia.ref
scilab/modules/hdf5/tests/unit_tests/h5open.tst
scilab/modules/statistics/help/en_US/summaries/tabul.xml
scilab/modules/statistics/help/ja_JP/summaries/tabul.xml
scilab/tools/innosetup/base.iss
scilab/tools/innosetup/languages.iss

index 4531088..d8d0d56 100644 (file)
@@ -198,7 +198,6 @@ $(top_srcdir)/CHANGES_6.0.X \
 $(top_srcdir)/ACKNOWLEDGEMENTS \
 $(top_srcdir)/COPYING \
 $(top_srcdir)/COPYING-BSD \
-$(top_srcdir)/COPYING-FR \
 $(top_srcdir)/README_Unix \
 $(top_srcdir)/RELEASE_NOTES_5.0.X \
 $(top_srcdir)/RELEASE_NOTES_5.1.X \
@@ -206,7 +205,6 @@ $(top_srcdir)/RELEASE_NOTES_5.2.X \
 $(top_srcdir)/RELEASE_NOTES_5.3.X \
 $(top_srcdir)/Readme_Visual.txt \
 $(top_srcdir)/README_Windows.txt \
-$(top_builddir)/license.txt \
 $(top_builddir)/Version.incl
 
 valgrinddir=$(pkgdatadir)/tools/profiling
index 53dc13e..3ae8a65 100644 (file)
@@ -916,7 +916,6 @@ $(top_srcdir)/CHANGES_6.0.X \
 $(top_srcdir)/ACKNOWLEDGEMENTS \
 $(top_srcdir)/COPYING \
 $(top_srcdir)/COPYING-BSD \
-$(top_srcdir)/COPYING-FR \
 $(top_srcdir)/README_Unix \
 $(top_srcdir)/RELEASE_NOTES_5.0.X \
 $(top_srcdir)/RELEASE_NOTES_5.1.X \
@@ -924,7 +923,6 @@ $(top_srcdir)/RELEASE_NOTES_5.2.X \
 $(top_srcdir)/RELEASE_NOTES_5.3.X \
 $(top_srcdir)/Readme_Visual.txt \
 $(top_srcdir)/README_Windows.txt \
-$(top_builddir)/license.txt \
 $(top_builddir)/Version.incl
 
 valgrinddir = $(pkgdatadir)/tools/profiling
index 68265c6..f1058ec 100644 (file)
@@ -25,11 +25,11 @@ assert_checkequal(a.root.Name,"/");
 h5write(a,"Dset_1",[1 2;3 4]);
 h5close(a);
 try
-    h5open(SCI + "/COPYING-FR");
+    h5open(SCI + "/COPYING");
     error("h5open should produce an error");
 catch
 end
-copyfile(SCI+"/COPYING-FR",TMPDIR+"/z.h5");
+copyfile(SCI+"/COPYING",TMPDIR+"/z.h5");
 try
     h5open(TMPDIR+"/z.h5");
     error("h5open should produce an error");
index 612ba03..a151945 100644 (file)
@@ -26,12 +26,12 @@ h5write(a,"Dset_1",[1 2;3 4]);
 h5close(a);
 
 try
-    h5open(SCI + "/COPYING-FR");
+    h5open(SCI + "/COPYING");
     error("h5open should produce an error");
 catch
 end
 
-copyfile(SCI+"/COPYING-FR",TMPDIR+"/z.h5");
+copyfile(SCI+"/COPYING",TMPDIR+"/z.h5");
 try
     h5open(TMPDIR+"/z.h5");
     error("h5open should produce an error");
index 047feb2..f0c4981 100644 (file)
@@ -123,12 +123,12 @@ xtitle("empirical probabilities of B(70,0.5)")
         <programlisting role="example"><![CDATA[ 
 
 // computes the occurrences of words of the license of scilab 
-text = read(SCI+"/license.txt",-1,1,"(A)"); // read the scilab license
+text = read(SCI+"/COPYING",-1,1,"(A)");     // read the scilab license
 bigstr = strcat(text," ");                  // put all the lines in a big string
 sep =  [" " "," "." ";" "*" ":" "-" """"];  // words separators 
 words = tokens(bigstr, sep);                // cut the big string into words
 m = tabul(words);                           // computes occurrences of each word
-[occ , p] = gsort(m(2));                     // sort by decreasing frequencies
+[occ , p] = gsort(m(2));                    // sort by decreasing frequencies
 results = [m(1)(p) string(occ)]             // display result
  ]]></programlisting>
     </refsection>
index b238185..63375aa 100644 (file)
@@ -107,12 +107,12 @@ clf()
 plot2d3(m(:,1), m(:,2)/n)
 xtitle("empirical probabilities of B(70,0.5)")
 // 最後の例 : scilabライセンスにおける単語の頻度を計算
-text = read(SCI+"/license.txt",-1,1,"(A)"); // scilabライセンスを読む
+text = read(SCI+"/COPYING",-1,1,"(A)");     // scilabライセンスを読む
 bigstr = strcat(text," ");                  // 全ての行を一つの大きな文字列にする
 sep =  [" " "," "." ";" "*" ":" "-" """"];  // 単語セパレータ
 words = tokens(bigstr, sep);                // 大きな文字列を単語に分割
 m = tabul(words);                           // 各単語の出現頻度を計算
-[occ , p] = gsort(m(2));                     // 降順に頻度をソート
+[occ , p] = gsort(m(2));                    // 降順に頻度をソート
 results = [m(1)(p) string(occ)]             // 結果を表示
  ]]></programlisting>
     </refsection>
index ea0187a..b89a06e 100644 (file)
@@ -38,10 +38,7 @@ Source: etc\logging.properties; DestDir: {app}\etc; Components: {#COMPN_SCILAB}
 Source: RELEASE_NOTES*.*; DestDir: {app}; Components: {#COMPN_SCILAB}
 ;
 Source: CHANGES*.*; DestDir: {app}; Components: {#COMPN_SCILAB}
-;Source: licence.txt; DestDir: {app}; Components: {#COMPN_SCILAB}
-;Source: license.txt; DestDir: {app}; Components: {#COMPN_SCILAB}
 Source: COPYING; DestDir: {app}; Components: {#COMPN_SCILAB}
-Source: COPYING-FR; DestDir: {app}; Components: {#COMPN_SCILAB}
 Source: COPYING-BSD; DestDir: {app}; Components: {#COMPN_SCILAB}
 ;
 Source: Readme_Visual.txt; DestDir: {app}; Components: {#COMPN_SCILAB}
index 3c639bc..0a8206d 100644 (file)
@@ -29,6 +29,6 @@ Name: "it_IT"; MessagesFile: "compiler:Languages\Italian.isl"; LicenseFile: {#Bi
 Name: "ca_ES"; MessagesFile: "compiler:Languages\Catalan.isl"; LicenseFile: {#BinariesSourcePath}\COPYING
 Name: "de_DE"; MessagesFile: "compiler:Languages\German.isl"; LicenseFile: {#BinariesSourcePath}\COPYING
 Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"; LicenseFile: {#BinariesSourcePath}\COPYING
-Name: "fr_FR"; MessagesFile: "compiler:Languages\French.isl"; LicenseFile: {#BinariesSourcePath}\COPYING-FR
+Name: "fr_FR"; MessagesFile: "compiler:Languages\French.isl"; LicenseFile: {#BinariesSourcePath}\COPYING
 Name: "cs_CZ"; MessagesFile: "compiler:Languages\Czech.isl"; LicenseFile: {#BinariesSourcePath}\COPYING
 ;-------------------------------------------------------------------------------