r35556 - in /packages/scilab/trunk/debian: changelog control copyright patches/xmlCleanupParser.diff scilab-data.lintian-overrides
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Wed Mar 4 15:43:48 UTC 2009
Author: sylvestre-guest
Date: Wed Mar 4 15:43:47 2009
New Revision: 35556
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35556
Log:
* Package scilab-include added (was missing in the previous version)
* sivp added in the recommanded packages (Closes: #505203)
* Replaces: scilab (< 5.0) added in scilab-bin (caused issue in the 4.X
=> 5.X upgrade)
* Patch xmlCleanupParser.diff added (fix some problems with the latest
version of libxml... which is not yet present in Debian).
* Add a lintian override for some visual project files
* Copyright update about javasci's examples (public domain now)
Added:
packages/scilab/trunk/debian/patches/xmlCleanupParser.diff
packages/scilab/trunk/debian/scilab-data.lintian-overrides
Modified:
packages/scilab/trunk/debian/changelog
packages/scilab/trunk/debian/control
packages/scilab/trunk/debian/copyright
Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35556&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Wed Mar 4 15:43:47 2009
@@ -5,6 +5,10 @@
* sivp added in the recommanded packages (Closes: #505203)
* Replaces: scilab (< 5.0) added in scilab-bin (caused issue in the 4.X
=> 5.X upgrade)
+ * Patch xmlCleanupParser.diff added (fix some problems with the latest
+ version of libxml... which is not yet present in Debian).
+ * Add a lintian override for some visual project files
+ * Copyright update about javasci's examples (public domain now)
[ Christoph Korn ]
* debian/patches/filesWithSpace.diff: Removes a space in two filenames.
Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=35556&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Wed Mar 4 15:43:47 2009
@@ -72,7 +72,7 @@
Package: scilab-bin
Architecture: any
Depends: ${shlibs:Depends}, scilab-data (= ${source:Version}),
- openjdk-6-jre | java1-runtime | java2-runtime,
+ openjdk-6-jre | java2-runtime,
libflexdock-java, libjogl-java (>= 1.1.1), libjrosetta-java (>= 1.0.1),
javahelp2, ${misc:Depends}
Recommends: pvm
Modified: packages/scilab/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/copyright?rev=35556&op=diff
==============================================================================
--- packages/scilab/trunk/debian/copyright (original)
+++ packages/scilab/trunk/debian/copyright Wed Mar 4 15:43:47 2009
@@ -856,6 +856,22 @@
License:
Public domain
+
+----- Module: javasci -----
+
+Examples:
+=========
+
+Files: examples/
+
+Copyright:
+Copyright (c) 2008-2009 - DIGITEO
+Copyright (c) 1989-2008 - INRIA
+Copyright (c) 1989-2007 - ENPC
+
+Licenses:
+Public domain
+
----- Module: fftw -----
FFTW3:
Added: packages/scilab/trunk/debian/patches/xmlCleanupParser.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/xmlCleanupParser.diff?rev=35556&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/xmlCleanupParser.diff (added)
+++ packages/scilab/trunk/debian/patches/xmlCleanupParser.diff Wed Mar 4 15:43:47 2009
@@ -1,0 +1,150 @@
+commit 5076ce4e1349745d648b7a49cb388c5921ff16e3
+Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
+Date: Wed Mar 4 10:02:47 2009 +0100
+
+ Cleanup the xml parser only at the end of Scilab... See bug #4052
+
+diff --git a/scilab/modules/core/src/c/TerminateCore.c b/scilab/modules/core/src/c/TerminateCore.c
+index 6ca9b02..e6ea393 100644
+--- a/scilab/modules/core/src/c/TerminateCore.c
++++ b/scilab/modules/core/src/c/TerminateCore.c
+@@ -9,6 +9,8 @@
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
++#include <libxml/parser.h>
++
+ #include "TerminateCore.h"
+ /*--------------------------------------------------------------------------*/
+ #include "realmain.h" /* Get_no_startup_flag */
+@@ -54,6 +56,11 @@ BOOL TerminateCorePart2(void)
+ /* Close all scilab's files */
+ TerminateScilabFilesList();
+
++ /*
++ * Cleanup function for the XML library.
++ */
++ xmlCleanupParser();
++
+ /** clean tmpfiles **/
+ C2F(tmpdirc)();
+
+diff --git a/scilab/modules/core/src/c/getmodules.c b/scilab/modules/core/src/c/getmodules.c
+index be0b65c..163a096 100644
+--- a/scilab/modules/core/src/c/getmodules.c
++++ b/scilab/modules/core/src/c/getmodules.c
+@@ -222,10 +222,7 @@ static BOOL AppendModules(char *xmlfilename)
+ if(xpathObj) xmlXPathFreeObject(xpathObj);
+ if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
+ xmlFreeDoc (doc);
+- /*
+- * Cleanup function for the XML library.
+- */
+- xmlCleanupParser();
++
+ }
+ else
+ {
+diff --git a/scilab/modules/core/src/c/loadversion.c b/scilab/modules/core/src/c/loadversion.c
+index 21ae13f..c0e1fcb 100644
+--- a/scilab/modules/core/src/c/loadversion.c
++++ b/scilab/modules/core/src/c/loadversion.c
+@@ -133,10 +133,6 @@ BOOL getversionmodule(char *modulename,
+ if(xpathObj) xmlXPathFreeObject(xpathObj);
+ if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
+ xmlFreeDoc (doc);
+- /*
+- * Cleanup function for the XML library.
+- */
+- xmlCleanupParser();
+ }
+ else
+ {
+diff --git a/scilab/modules/core/src/c/readGateway.c b/scilab/modules/core/src/c/readGateway.c
+index 9db8398..8d3f965 100644
+--- a/scilab/modules/core/src/c/readGateway.c
++++ b/scilab/modules/core/src/c/readGateway.c
+@@ -205,11 +205,6 @@ static struct gateway_struct *readGatewayXmlFile(char *filenameXml)
+ if(xpathObj) xmlXPathFreeObject(xpathObj);
+ if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
+ xmlFreeDoc (doc);
+-
+- /*
+- * Cleanup function for the XML library.
+- */
+- xmlCleanupParser();
+ }
+ else
+ {
+diff --git a/scilab/modules/jvm/src/c/getJvmOptions.c b/scilab/modules/jvm/src/c/getJvmOptions.c
+index e2c5512..c09c8a7 100644
+--- a/scilab/modules/jvm/src/c/getJvmOptions.c
++++ b/scilab/modules/jvm/src/c/getJvmOptions.c
+@@ -1,4 +1,3 @@
+-
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Allan CORNET
+@@ -108,10 +107,11 @@ JavaVMOption * getJvmOptions(char *SCI_PATH,char *filename_xml_conf,int *size_Ja
+ if(xpathObj) xmlXPathFreeObject(xpathObj);
+ if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
+ xmlFreeDoc (doc);
+- /*
+- * Cleanup function for the XML library.
+- */
+- xmlCleanupParser();
++
++ /* xmlCleanupParser is called in
++ * modules/core/src/c/TerminateCore.c
++ * since it needs to be done only once.
++ */
+
+ if (getenv("SCI_JAVA_ENABLE_HEADLESS")!=NULL) {
+ /* When Scilab is built from a virtual machine, it needs
+diff --git a/scilab/modules/jvm/src/c/loadClasspath.c b/scilab/modules/jvm/src/c/loadClasspath.c
+index 8809c9b..65570c1 100644
+--- a/scilab/modules/jvm/src/c/loadClasspath.c
++++ b/scilab/modules/jvm/src/c/loadClasspath.c
+@@ -168,10 +168,7 @@ BOOL LoadClasspath(char *xmlfilename)
+
+ if(xpathObj) xmlXPathFreeObject(xpathObj);
+ if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
+- /*
+- * Cleanup function for the XML library.
+- */
+- xmlCleanupParser();
++
+ }
+ else
+ {
+diff --git a/scilab/modules/jvm/src/c/loadLibrarypath.c b/scilab/modules/jvm/src/c/loadLibrarypath.c
+index 68dbdb7..6484c83 100644
+--- a/scilab/modules/jvm/src/c/loadLibrarypath.c
++++ b/scilab/modules/jvm/src/c/loadLibrarypath.c
+@@ -117,10 +117,6 @@ BOOL LoadLibrarypath(char *xmlfilename)
+ if(xpathObj) xmlXPathFreeObject(xpathObj);
+ if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
+ xmlFreeDoc (doc);
+- /*
+- * Cleanup function for the XML library.
+- */
+- xmlCleanupParser();
+ }
+ else
+ {
+diff --git a/scilab/modules/jvm/src/c/loadOnUseClassPath.c b/scilab/modules/jvm/src/c/loadOnUseClassPath.c
+index e29f8ae..ef0b52f 100644
+--- a/scilab/modules/jvm/src/c/loadOnUseClassPath.c
++++ b/scilab/modules/jvm/src/c/loadOnUseClassPath.c
+@@ -113,10 +113,7 @@ BOOL loadOnUseClassPath(char *tag)
+ }
+ if(xpathObj) xmlXPathFreeObject(xpathObj);
+ if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
+- /*
+- * Cleanup function for the XML library.
+- */
+- xmlCleanupParser();
++
+ }
+ else
+ {
Added: packages/scilab/trunk/debian/scilab-data.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-data.lintian-overrides?rev=35556&op=file
==============================================================================
--- packages/scilab/trunk/debian/scilab-data.lintian-overrides (added)
+++ packages/scilab/trunk/debian/scilab-data.lintian-overrides Wed Mar 4 15:43:47 2009
@@ -1,0 +1,4 @@
+# Call Scilab from application... Visual project
+scilab-data: windows-devel-file-in-package usr/share/scilab/modules/core/examples/call_scilab/c/visual_studio/CallSciVC.sln
+scilab-data: windows-devel-file-in-package usr/share/scilab/modules/core/examples/call_scilab/c/visual_studio/CallSciVC.vcproj
+scilab-data: windows-devel-file-in-package usr/share/scilab/modules/core/examples/call_scilab/fortran/example.sln
More information about the debian-science-commits
mailing list