r46628 - in /packages/scilab/branches/5.5/debian: changelog patches/depend-scicos.diff patches/link-issue.diff patches/missing-lib.diff patches/series rules

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Fri Apr 11 15:36:51 UTC 2014 

Author: sylvestre
Date: Fri Apr 11 15:36:51 2014
New Revision: 46628

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46628
Log:
* Stable release (very similar to beta-1+git~20140406-1522)
* Add back the wrongly removed depend-scicos.diff
* Also disable ocamlopt features on mips mipsel s390x sparc

Added:
    packages/scilab/branches/5.5/debian/patches/depend-scicos.diff
    packages/scilab/branches/5.5/debian/patches/missing-lib.diff
Removed:
    packages/scilab/branches/5.5/debian/patches/link-issue.diff
Modified:
    packages/scilab/branches/5.5/debian/changelog
    packages/scilab/branches/5.5/debian/patches/series
    packages/scilab/branches/5.5/debian/rules

Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=46628&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Fri Apr 11 15:36:51 2014
@@ -1,3 +1,11 @@
+scilab (5.5.0-1) unstable; urgency=medium
+
+  * Stable release (very similar to beta-1+git~20140406-1522)
+  * Add back the wrongly removed depend-scicos.diff
+  * Also disable ocamlopt features on mips mipsel s390x sparc
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 11 Apr 2014 15:02:39 +0200
+
 scilab (5.5.0~beta-1+git~20140406-1522-3) unstable; urgency=medium
 
   * Fix the build under Ubuntu. Thanks to Clement David for the patch

Added: packages/scilab/branches/5.5/debian/patches/depend-scicos.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/depend-scicos.diff?rev=46628&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/depend-scicos.diff	(added)
+++ packages/scilab/branches/5.5/debian/patches/depend-scicos.diff	Fri Apr 11 15:36:51 2014
@@ -0,0 +1,308 @@
+Index: scilab-5.5.0/modules/scicos/.depend
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ scilab-5.5.0/modules/scicos/.depend	2014-04-11 15:12:06.094927858 +0200
+@@ -0,0 +1,303 @@
++src/modelica_compiler/parseTree.cmi:
++src/modelica_compiler/linenum.cmi:
++src/modelica_compiler/parser.cmi: ./src/modelica_compiler/parseTree.cmi
++src/modelica_compiler/lexer.cmi: ./src/translator/parsing/parser.cmi
++src/modelica_compiler/precompilation.cmi: \
++    ./src/modelica_compiler/parseTree.cmi
++src/modelica_compiler/compilation.cmi: \
++    ./src/modelica_compiler/precompilation.cmi
++src/modelica_compiler/instantiation.cmi: \
++    ./src/modelica_compiler/compilation.cmi
++src/modelica_compiler/graphNodeSet.cmi:
++src/modelica_compiler/symbolicExpression.cmi:
++src/modelica_compiler/squareSparseMatrix.cmi:
++src/modelica_compiler/bipartiteGraph.cmi:
++src/modelica_compiler/hungarianMethod.cmi:
++src/modelica_compiler/causalityGraph.cmi:
++src/modelica_compiler/optimization.cmi: \
++    ./src/modelica_compiler/symbolicExpression.cmi \
++    ./src/translator/instantiation/instantiation.cmi \
++    ./src/modelica_compiler/compilation.cmi
++src/modelica_compiler/xMLCodeGeneration.cmi: \
++    ./src/modelica_compiler/optimization.cmi
++src/modelica_compiler/optimizingCompiler.cmi: \
++    ./src/modelica_compiler/optimization.cmi
++src/modelica_compiler/scicosCodeGeneration.cmi: \
++    ./src/modelica_compiler/optimization.cmi
++src/modelica_compiler/scicosOptimizingCompiler.cmi:
++src/modelica_compiler/parseTree.cmo: src/modelica_compiler/parseTree.cmi
++src/modelica_compiler/parseTree.cmx: src/modelica_compiler/parseTree.cmi
++src/modelica_compiler/linenum.cmo: src/modelica_compiler/linenum.cmi
++src/modelica_compiler/linenum.cmx: src/modelica_compiler/linenum.cmi
++src/modelica_compiler/parser.cmo: ./src/modelica_compiler/parseTree.cmi \
++    ./src/translator/parsing/linenum.cmi src/modelica_compiler/parser.cmi
++src/modelica_compiler/parser.cmx: ./src/modelica_compiler/parseTree.cmx \
++    ./src/translator/parsing/linenum.cmx src/modelica_compiler/parser.cmi
++src/modelica_compiler/lexer.cmo: ./src/translator/parsing/parser.cmi \
++    src/modelica_compiler/lexer.cmi
++src/modelica_compiler/lexer.cmx: ./src/translator/parsing/parser.cmx \
++    src/modelica_compiler/lexer.cmi
++src/modelica_compiler/precompilation.cmo: \
++    ./src/modelica_compiler/parseTree.cmi \
++    src/modelica_compiler/precompilation.cmi
++src/modelica_compiler/precompilation.cmx: \
++    ./src/modelica_compiler/parseTree.cmx \
++    src/modelica_compiler/precompilation.cmi
++src/modelica_compiler/compilation.cmo: \
++    ./src/modelica_compiler/precompilation.cmi \
++    ./src/modelica_compiler/parseTree.cmi \
++    src/modelica_compiler/compilation.cmi
++src/modelica_compiler/compilation.cmx: \
++    ./src/modelica_compiler/precompilation.cmx \
++    ./src/modelica_compiler/parseTree.cmx \
++    src/modelica_compiler/compilation.cmi
++src/modelica_compiler/instantiation.cmo: \
++    ./src/modelica_compiler/compilation.cmi \
++    src/modelica_compiler/instantiation.cmi
++src/modelica_compiler/instantiation.cmx: \
++    ./src/modelica_compiler/compilation.cmx \
++    src/modelica_compiler/instantiation.cmi
++src/modelica_compiler/graphNodeSet.cmo: \
++    src/modelica_compiler/graphNodeSet.cmi
++src/modelica_compiler/graphNodeSet.cmx: \
++    src/modelica_compiler/graphNodeSet.cmi
++src/modelica_compiler/symbolicExpression.cmo: \
++    ./src/modelica_compiler/graphNodeSet.cmi \
++    src/modelica_compiler/symbolicExpression.cmi
++src/modelica_compiler/symbolicExpression.cmx: \
++    ./src/modelica_compiler/graphNodeSet.cmx \
++    src/modelica_compiler/symbolicExpression.cmi
++src/modelica_compiler/squareSparseMatrix.cmo: \
++    src/modelica_compiler/squareSparseMatrix.cmi
++src/modelica_compiler/squareSparseMatrix.cmx: \
++    src/modelica_compiler/squareSparseMatrix.cmi
++src/modelica_compiler/bipartiteGraph.cmo: \
++    src/modelica_compiler/bipartiteGraph.cmi
++src/modelica_compiler/bipartiteGraph.cmx: \
++    src/modelica_compiler/bipartiteGraph.cmi
++src/modelica_compiler/hungarianMethod.cmo: \
++    src/modelica_compiler/hungarianMethod.cmi
++src/modelica_compiler/hungarianMethod.cmx: \
++    src/modelica_compiler/hungarianMethod.cmi
++src/modelica_compiler/causalityGraph.cmo: \
++    src/modelica_compiler/causalityGraph.cmi
++src/modelica_compiler/causalityGraph.cmx: \
++    src/modelica_compiler/causalityGraph.cmi
++src/modelica_compiler/optimization.cmo: \
++    ./src/modelica_compiler/symbolicExpression.cmi \
++    ./src/modelica_compiler/squareSparseMatrix.cmi \
++    ./src/translator/instantiation/instantiation.cmi \
++    ./src/modelica_compiler/hungarianMethod.cmi \
++    ./src/modelica_compiler/compilation.cmi \
++    ./src/modelica_compiler/causalityGraph.cmi \
++    ./src/modelica_compiler/bipartiteGraph.cmi \
++    src/modelica_compiler/optimization.cmi
++src/modelica_compiler/optimization.cmx: \
++    ./src/modelica_compiler/symbolicExpression.cmx \
++    ./src/modelica_compiler/squareSparseMatrix.cmx \
++    ./src/translator/instantiation/instantiation.cmx \
++    ./src/modelica_compiler/hungarianMethod.cmx \
++    ./src/modelica_compiler/compilation.cmx \
++    ./src/modelica_compiler/causalityGraph.cmx \
++    ./src/modelica_compiler/bipartiteGraph.cmx \
++    src/modelica_compiler/optimization.cmi
++src/modelica_compiler/xMLCodeGeneration.cmo: \
++    ./src/modelica_compiler/symbolicExpression.cmi \
++    ./src/modelica_compiler/optimization.cmi \
++    src/modelica_compiler/xMLCodeGeneration.cmi
++src/modelica_compiler/xMLCodeGeneration.cmx: \
++    ./src/modelica_compiler/symbolicExpression.cmx \
++    ./src/modelica_compiler/optimization.cmx \
++    src/modelica_compiler/xMLCodeGeneration.cmi
++src/modelica_compiler/optimizingCompiler.cmo: \
++    ./src/modelica_compiler/xMLCodeGeneration.cmi \
++    ./src/modelica_compiler/precompilation.cmi \
++    ./src/translator/parsing/parser.cmi \
++    ./src/modelica_compiler/optimization.cmi \
++    ./src/translator/parsing/lexer.cmi \
++    ./src/translator/instantiation/instantiation.cmi \
++    ./src/modelica_compiler/compilation.cmi \
++    src/modelica_compiler/optimizingCompiler.cmi
++src/modelica_compiler/optimizingCompiler.cmx: \
++    ./src/modelica_compiler/xMLCodeGeneration.cmx \
++    ./src/modelica_compiler/precompilation.cmx \
++    ./src/translator/parsing/parser.cmx \
++    ./src/modelica_compiler/optimization.cmx \
++    ./src/translator/parsing/lexer.cmx \
++    ./src/translator/instantiation/instantiation.cmx \
++    ./src/modelica_compiler/compilation.cmx \
++    src/modelica_compiler/optimizingCompiler.cmi
++src/modelica_compiler/scicosCodeGeneration.cmo: \
++    ./src/modelica_compiler/symbolicExpression.cmi \
++    ./src/modelica_compiler/optimization.cmi \
++    ./src/translator/instantiation/instantiation.cmi \
++    src/modelica_compiler/scicosCodeGeneration.cmi
++src/modelica_compiler/scicosCodeGeneration.cmx: \
++    ./src/modelica_compiler/symbolicExpression.cmx \
++    ./src/modelica_compiler/optimization.cmx \
++    ./src/translator/instantiation/instantiation.cmx \
++    src/modelica_compiler/scicosCodeGeneration.cmi
++src/modelica_compiler/scicosOptimizingCompiler.cmo: \
++    ./src/modelica_compiler/scicosCodeGeneration.cmi \
++    ./src/modelica_compiler/optimizingCompiler.cmi \
++    src/modelica_compiler/scicosOptimizingCompiler.cmi
++src/modelica_compiler/scicosOptimizingCompiler.cmx: \
++    ./src/modelica_compiler/scicosCodeGeneration.cmx \
++    ./src/modelica_compiler/optimizingCompiler.cmx \
++    src/modelica_compiler/scicosOptimizingCompiler.cmi
++src/xml2modelica/xMLTree.cmo:
++src/xml2modelica/xMLTree.cmx:
++src/xml2modelica/linenum.cmo:
++src/xml2modelica/linenum.cmx:
++src/xml2modelica/stringParser.cmo:
++src/xml2modelica/stringParser.cmx:
++src/xml2modelica/stringLexer.cmo: ./src/xml2modelica/stringParser.cmo
++src/xml2modelica/stringLexer.cmx: ./src/xml2modelica/stringParser.cmx
++src/xml2modelica/xMLParser.cmo: ./src/xml2modelica/xMLTree.cmo \
++    ./src/translator/parsing/linenum.cmi
++src/xml2modelica/xMLParser.cmx: ./src/xml2modelica/xMLTree.cmx \
++    ./src/translator/parsing/linenum.cmx
++src/xml2modelica/xMLLexer.cmo: ./src/xml2modelica/xMLParser.cmo
++src/xml2modelica/xMLLexer.cmx: ./src/xml2modelica/xMLParser.cmx
++src/xml2modelica/modelicaCodeGenerator.cmo: ./src/xml2modelica/xMLTree.cmo \
++    ./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringLexer.cmo
++src/xml2modelica/modelicaCodeGenerator.cmx: ./src/xml2modelica/xMLTree.cmx \
++    ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.cmx
++src/xml2modelica/xML2Modelica.cmo: ./src/xml2modelica/xMLParser.cmo \
++    ./src/xml2modelica/xMLLexer.cmo \
++    ./src/xml2modelica/modelicaCodeGenerator.cmo
++src/xml2modelica/xML2Modelica.cmx: ./src/xml2modelica/xMLParser.cmx \
++    ./src/xml2modelica/xMLLexer.cmx \
++    ./src/xml2modelica/modelicaCodeGenerator.cmx
++src/translator/parsing/syntax.cmi:
++src/translator/parsing/parser.cmi: ./src/translator/parsing/syntax.cmi
++src/translator/parsing/lexer.cmi: ./src/translator/parsing/parser.cmi
++src/translator/parsing/linenum.cmi:
++src/translator/compilation/types.cmi:
++src/translator/compilation/nameResolve.cmi: \
++    ./src/translator/compilation/types.cmi \
++    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi
++src/translator/instantiation/instantiation.cmi: \
++    ./src/translator/compilation/types.cmi \
++    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
++    ./src/translator/compilation/nameResolve.cmi
++src/translator/exceptionHandling/msgDico.cmi:
++src/translator/exceptionHandling/errorDico.cmi: \
++    ./src/translator/parsing/parser.cmi \
++    ./src/translator/instantiation/instantiation.cmi
++src/translator/exceptionHandling/exceptHandler.cmi: \
++    ./src/translator/parsing/parser.cmi \
++    ./src/translator/instantiation/instantiation.cmi
++src/translator/translation/libraryManager.cmi: \
++    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi
++src/translator/translation/codeGeneration.cmi: \
++    ./src/translator/compilation/types.cmi \
++    ./src/translator/instantiation/instantiation.cmi \
++    ./src/translator/exceptionHandling/errorDico.cmi
++src/translator/translation/versiondate.cmi:
++src/translator/translation/translator.cmi: \
++    ./src/translator/parsing/syntax.cmi \
++    ./src/translator/compilation/nameResolve.cmi \
++    ./src/translator/instantiation/instantiation.cmi
++src/translator/parsing/syntax.cmo: src/translator/parsing/syntax.cmi
++src/translator/parsing/syntax.cmx: src/translator/parsing/syntax.cmi
++src/translator/parsing/parser.cmo: ./src/translator/parsing/syntax.cmi \
++    src/translator/parsing/parser.cmi
++src/translator/parsing/parser.cmx: ./src/translator/parsing/syntax.cmx \
++    src/translator/parsing/parser.cmi
++src/translator/parsing/lexer.cmo: ./src/translator/parsing/parser.cmi \
++    src/translator/parsing/lexer.cmi
++src/translator/parsing/lexer.cmx: ./src/translator/parsing/parser.cmx \
++    src/translator/parsing/lexer.cmi
++src/translator/parsing/linenum.cmo: src/translator/parsing/linenum.cmi
++src/translator/parsing/linenum.cmx: src/translator/parsing/linenum.cmi
++src/translator/compilation/types.cmo: src/translator/compilation/types.cmi
++src/translator/compilation/types.cmx: src/translator/compilation/types.cmi
++src/translator/compilation/nameResolve.cmo: \
++    ./src/translator/compilation/types.cmi \
++    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
++    src/translator/compilation/nameResolve.cmi
++src/translator/compilation/nameResolve.cmx: \
++    ./src/translator/compilation/types.cmx \
++    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \
++    src/translator/compilation/nameResolve.cmi
++src/translator/instantiation/instantiation.cmo: \
++    ./src/translator/compilation/types.cmi \
++    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
++    ./src/translator/compilation/nameResolve.cmi \
++    src/translator/instantiation/instantiation.cmi
++src/translator/instantiation/instantiation.cmx: \
++    ./src/translator/compilation/types.cmx \
++    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \
++    ./src/translator/compilation/nameResolve.cmx \
++    src/translator/instantiation/instantiation.cmi
++src/translator/exceptionHandling/msgDico.cmo: \
++    src/translator/exceptionHandling/msgDico.cmi
++src/translator/exceptionHandling/msgDico.cmx: \
++    src/translator/exceptionHandling/msgDico.cmi
++src/translator/exceptionHandling/errorDico.cmo: \
++    ./src/translator/parsing/parser.cmi \
++    ./src/translator/compilation/nameResolve.cmi \
++    ./src/translator/instantiation/instantiation.cmi \
++    src/translator/exceptionHandling/errorDico.cmi
++src/translator/exceptionHandling/errorDico.cmx: \
++    ./src/translator/parsing/parser.cmx \
++    ./src/translator/compilation/nameResolve.cmx \
++    ./src/translator/instantiation/instantiation.cmx \
++    src/translator/exceptionHandling/errorDico.cmi
++src/translator/exceptionHandling/exceptHandler.cmo: \
++    ./src/translator/parsing/parser.cmi \
++    ./src/translator/compilation/nameResolve.cmi \
++    ./src/translator/exceptionHandling/msgDico.cmi \
++    ./src/translator/parsing/linenum.cmi \
++    ./src/translator/instantiation/instantiation.cmi \
++    ./src/translator/exceptionHandling/errorDico.cmi \
++    src/translator/exceptionHandling/exceptHandler.cmi
++src/translator/exceptionHandling/exceptHandler.cmx: \
++    ./src/translator/parsing/parser.cmx \
++    ./src/translator/compilation/nameResolve.cmx \
++    ./src/translator/exceptionHandling/msgDico.cmx \
++    ./src/translator/parsing/linenum.cmx \
++    ./src/translator/instantiation/instantiation.cmx \
++    ./src/translator/exceptionHandling/errorDico.cmx \
++    src/translator/exceptionHandling/exceptHandler.cmi
++src/translator/translation/libraryManager.cmo: \
++    ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.cmi \
++    ./src/translator/exceptionHandling/exceptHandler.cmi \
++    src/translator/translation/libraryManager.cmi
++src/translator/translation/libraryManager.cmx: \
++    ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.cmx \
++    ./src/translator/exceptionHandling/exceptHandler.cmx \
++    src/translator/translation/libraryManager.cmi
++src/translator/translation/codeGeneration.cmo: \
++    ./src/translator/compilation/types.cmi \
++    ./src/translator/compilation/nameResolve.cmi \
++    ./src/translator/instantiation/instantiation.cmi \
++    ./src/translator/exceptionHandling/errorDico.cmi \
++    src/translator/translation/codeGeneration.cmi
++src/translator/translation/codeGeneration.cmx: \
++    ./src/translator/compilation/types.cmx \
++    ./src/translator/compilation/nameResolve.cmx \
++    ./src/translator/instantiation/instantiation.cmx \
++    ./src/translator/exceptionHandling/errorDico.cmx \
++    src/translator/translation/codeGeneration.cmi
++src/translator/translation/versiondate.cmo: \
++    src/translator/translation/versiondate.cmi
++src/translator/translation/versiondate.cmx: \
++    src/translator/translation/versiondate.cmi
++src/translator/translation/translator.cmo: \
++    ./src/translator/translation/versiondate.cmi \
++    ./src/translator/compilation/nameResolve.cmi \
++    ./src/translator/translation/libraryManager.cmi \
++    ./src/translator/instantiation/instantiation.cmi \
++    ./src/translator/exceptionHandling/exceptHandler.cmi \
++    ./src/translator/translation/codeGeneration.cmi \
++    src/translator/translation/translator.cmi
++src/translator/translation/translator.cmx: \
++    ./src/translator/translation/versiondate.cmx \
++    ./src/translator/compilation/nameResolve.cmx \
++    ./src/translator/translation/libraryManager.cmx \
++    ./src/translator/instantiation/instantiation.cmx \
++    ./src/translator/exceptionHandling/exceptHandler.cmx \
++    ./src/translator/translation/codeGeneration.cmx \
++    src/translator/translation/translator.cmi

Added: packages/scilab/branches/5.5/debian/patches/missing-lib.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/missing-lib.diff?rev=46628&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/missing-lib.diff	(added)
+++ packages/scilab/branches/5.5/debian/patches/missing-lib.diff	Fri Apr 11 15:36:51 2014
@@ -0,0 +1,12 @@
+Index: scilab-5.5.0/Makefile.am
+===================================================================
+--- scilab-5.5.0.orig/Makefile.am	2014-04-11 11:51:34.000000000 +0200
++++ scilab-5.5.0/Makefile.am	2014-04-11 16:50:36.487951829 +0200
+@@ -74,6 +74,7 @@
+ if NEED_JAVA
+ scilab_bin_LDADD += \
+ 			$(top_builddir)/modules/console/libsciconsole.la \
++			$(top_builddir)/modules/console/libsciconsole-minimal.la \
+ 			$(top_builddir)/modules/jvm/libscijvm.la \
+ 			$(top_builddir)/modules/commons/libscicommons.la
+ else

Modified: packages/scilab/branches/5.5/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/series?rev=46628&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series	(original)
+++ packages/scilab/branches/5.5/debian/patches/series	Fri Apr 11 15:36:51 2014
@@ -3,4 +3,5 @@
 missingaddchapter.diff
 disable-xcos-dep-check.diff
 jh.diff
-link-issue.diff
+depend-scicos.diff
+missing-lib.diff

Modified: packages/scilab/branches/5.5/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/rules?rev=46628&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/rules	(original)
+++ packages/scilab/branches/5.5/debian/rules	Fri Apr 11 15:36:51 2014
@@ -24,7 +24,7 @@
 
 
 # requires ocamlopt
-ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64el))
+ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64el mips mipsel s390x sparc))
   DEB_CONFIGURE_NORMAL_ARGS += --without-modelica
 endif

More information about the debian-science-commits mailing list