r44642 - in /packages/scilab/trunk/debian: changelog patches/jhdf5-version.diff patches/jrosetta-jar.diff patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Thu Mar 29 23:28:11 2012
New Revision: 44642

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44642
Log:
Fix a bug on the startup of Xcos because the new version of hdf5
in the archive is 1.8.8 (Closes: #666215)

Added:
    packages/scilab/trunk/debian/patches/jhdf5-version.diff
    packages/scilab/trunk/debian/patches/jrosetta-jar.diff
Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/patches/series

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=44642&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Thu Mar 29 23:28:11 2012
@@ -1,3 +1,10 @@
+scilab (5.3.3-8) unstable; urgency=low
+
+  * Fix a bug on the startup of Xcos because the new version of hdf5
+    in the archive is 1.8.8 (Closes: #666215)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 29 Mar 2012 21:08:55 +0200
+
 scilab (5.3.3-7) unstable; urgency=low
 
   * Change dependency libhdf5-serial-dev => libhdf5-dev

Added: packages/scilab/trunk/debian/patches/jhdf5-version.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/jhdf5-version.diff?rev=44642&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/jhdf5-version.diff (added)
+++ packages/scilab/trunk/debian/patches/jhdf5-version.diff Thu Mar 29 23:28:11 2012
@@ -1,0 +1,13 @@
+Index: scilab-5.3.3/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+===================================================================
+--- scilab-5.3.3.orig/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java	2011-07-20 10:16:12.000000000 +0200
++++ scilab-5.3.3/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java	2012-03-29 21:06:39.000000000 +0200
+@@ -61,7 +61,7 @@
+ 	 * Dependencies version
+ 	 */
+ 	private static final List<String> MXGRAPH_VERSIONS = Arrays.asList("1.4.1.0");
+-	private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]");
++	private static final List<String> HDF5_VERSIONS = Arrays.asList("[1, 8, 4]", "[1, 8, 5]", "[1, 8, 8]");
+ 	private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7");
+ 	
+ 	private static final String UNABLE_TO_LOAD_JGRAPHX = 

Added: packages/scilab/trunk/debian/patches/jrosetta-jar.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/jrosetta-jar.diff?rev=44642&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/jrosetta-jar.diff (added)
+++ packages/scilab/trunk/debian/patches/jrosetta-jar.diff Thu Mar 29 23:28:11 2012
@@ -1,0 +1,13 @@
+Index: scilab-5.3.3/configure.ac
+===================================================================
+--- scilab-5.3.3.orig/configure.ac	2011-07-20 10:15:42.000000000 +0200
++++ scilab-5.3.3/configure.ac	2012-03-29 22:13:43.000000000 +0200
+@@ -907,7 +907,7 @@
+                 AC_SUBST(JHALL)
+ 
+                 # Console API
+-                AC_JAVA_CHECK_PACKAGE([jrosetta-API],[com.artenum.rosetta.interfaces.core.ConsoleConfiguration],[JRosetta : Console API Artenum / Scilab])
++                AC_JAVA_CHECK_PACKAGE([jrosetta-api],[com.artenum.rosetta.interfaces.core.ConsoleConfiguration],[JRosetta : Console API Artenum / Scilab])
+                 JROSETTA_API=$PACKAGE_JAR_FILE
+                 AC_SUBST(JROSETTA_API)
+ 

Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=44642&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Thu Mar 29 23:28:11 2012
@@ -7,3 +7,5 @@
 0001-Typo-in-the-scilab-adv-cli-desktop-declaration.patch
 
 default-java-path.diff
+jrosetta-jar.diff
+jhdf5-version.diff