r44865 - in /packages/scilab/branches/5.4/debian: changelog control patches/adddemo.diff patches/javalibpath.diff patches/librarypath.diff patches/missingaddchapter.diff patches/s390x.diff patches/series rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Mon May 21 17:16:09 UTC 2012
Author: sylvestre
Date: Mon May 21 17:16:09 2012
New Revision: 44865
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44865
Log:
* New snapshot release
* New graphic implementation, depends on libscirenderer-java
* Drop the dependency on PVM (no longer shipped in Scilab)
* Support of s390x
Added:
packages/scilab/branches/5.4/debian/patches/s390x.diff
Modified:
packages/scilab/branches/5.4/debian/changelog
packages/scilab/branches/5.4/debian/control
packages/scilab/branches/5.4/debian/patches/adddemo.diff
packages/scilab/branches/5.4/debian/patches/javalibpath.diff
packages/scilab/branches/5.4/debian/patches/librarypath.diff
packages/scilab/branches/5.4/debian/patches/missingaddchapter.diff
packages/scilab/branches/5.4/debian/patches/series
packages/scilab/branches/5.4/debian/rules
Modified: packages/scilab/branches/5.4/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/changelog?rev=44865&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/changelog (original)
+++ packages/scilab/branches/5.4/debian/changelog Mon May 21 17:16:09 2012
@@ -1,3 +1,12 @@
+scilab (5.4.0-alpha-20122105-824511b-1~exp1) experimental; urgency=low
+
+ * New snapshot release
+ * New graphic implementation, depends on libscirenderer-java
+ * Drop the dependency on PVM (no longer shipped in Scilab)
+ * Support of s390x
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Fri, 13 Apr 2012 13:44:52 +0200
+
scilab (5.4.0-alpha-20120903-33206a8-1~exp2) experimental; urgency=low
* Remove ccache from the dependencies (FTBFS on archs)
Modified: packages/scilab/branches/5.4/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/control?rev=44865&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/control (original)
+++ packages/scilab/branches/5.4/debian/control Mon May 21 17:16:09 2012
@@ -19,11 +19,11 @@
javahelp2, libsaxon-java, libavalon-framework-java, docbook-xsl,
libxml-commons-external-java,
# Optional Scilab features
- pvm-dev, libfftw3-dev, libsuitesparse-dev (>= 3.4.0),
+ libfftw3-dev, libsuitesparse-dev (>= 3.4.0),
libmatio-dev,
# latex rendering
libjlatexmath-java (>= 0.9.4), libjlatexmath-fop-java (>= 0.9.4),
- libscirenderer-java (>= 0.3.5),
+ libscirenderer-java (>= 0.4.4),
# Xcos
libjgraphx-java (>= 1.8.0.0), libhdf5-dev (>= 1.8.8), libjhdf5-java (>= 2.8.0), imagemagick,
# Unitary testing
Modified: packages/scilab/branches/5.4/debian/patches/adddemo.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/adddemo.diff?rev=44865&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/adddemo.diff (original)
+++ packages/scilab/branches/5.4/debian/patches/adddemo.diff Mon May 21 17:16:09 2012
@@ -1,7 +1,7 @@
-Index: scilab-5.4.0-alpha-1/modules/demo_tools/macros/add_demo.sci
+Index: scilab-5.4.0-alpha-20122105-824511b/modules/demo_tools/macros/add_demo.sci
===================================================================
---- scilab-5.4.0-alpha-1.orig/modules/demo_tools/macros/add_demo.sci 2011-12-28 11:28:12.875545097 +0100
-+++ scilab-5.4.0-alpha-1/modules/demo_tools/macros/add_demo.sci 2011-12-28 11:30:45.319549295 +0100
+--- scilab-5.4.0-alpha-20122105-824511b.orig/modules/demo_tools/macros/add_demo.sci 2012-05-21 14:59:42.000000000 +0200
++++ scilab-5.4.0-alpha-20122105-824511b/modules/demo_tools/macros/add_demo.sci 2012-05-21 14:59:50.000000000 +0200
@@ -35,7 +35,7 @@
path = pathconvert(path, %f, %t);
Modified: packages/scilab/branches/5.4/debian/patches/javalibpath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/javalibpath.diff?rev=44865&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/javalibpath.diff (original)
+++ packages/scilab/branches/5.4/debian/patches/javalibpath.diff Mon May 21 17:16:09 2012
@@ -1,8 +1,8 @@
-Index: scilab-5.2.2/modules/javasci/src/java/javasci/Scilab.java
+Index: scilab-5.4.0-alpha-20122105-824511b/modules/javasci/src/java/javasci/Scilab.java
===================================================================
---- scilab-5.2.2.orig/modules/javasci/src/java/javasci/Scilab.java 2010-06-13 23:26:23.000000000 +0200
-+++ scilab-5.2.2/modules/javasci/src/java/javasci/Scilab.java 2010-06-13 23:26:59.000000000 +0200
-@@ -101,6 +101,8 @@
+--- scilab-5.4.0-alpha-20122105-824511b.orig/modules/javasci/src/java/javasci/Scilab.java 2012-05-21 14:59:42.000000000 +0200
++++ scilab-5.4.0-alpha-20122105-824511b/modules/javasci/src/java/javasci/Scilab.java 2012-05-21 14:59:51.000000000 +0200
+@@ -110,6 +110,8 @@
static
{
try {
Modified: packages/scilab/branches/5.4/debian/patches/librarypath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/librarypath.diff?rev=44865&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/librarypath.diff (original)
+++ packages/scilab/branches/5.4/debian/patches/librarypath.diff Mon May 21 17:16:09 2012
@@ -1,8 +1,8 @@
-Index: scilab-5.2.2/bin/scilab
+Index: scilab-5.4.0-alpha-20122105-824511b/bin/scilab
===================================================================
---- scilab-5.2.2.orig/bin/scilab 2012-02-11 08:33:03.883445370 +0100
-+++ scilab-5.2.2/bin/scilab 2012-02-11 08:35:11.891442515 +0100
-@@ -742,7 +742,7 @@
+--- scilab-5.4.0-alpha-20122105-824511b.orig/bin/scilab 2012-05-21 14:59:42.000000000 +0200
++++ scilab-5.4.0-alpha-20122105-824511b/bin/scilab 2012-05-21 14:59:51.000000000 +0200
+@@ -739,7 +739,7 @@
# . is used by the dynamic link. The build lib are copied into the PWD
SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:.
@@ -11,7 +11,7 @@
case $OS in
*darwin* | *Darwin*) # MacOS X
-@@ -777,6 +777,7 @@
+@@ -783,6 +783,7 @@
*)
esac
@@ -19,7 +19,7 @@
if test $SCIVERBOSE -ne 0; then
echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
-@@ -1001,6 +1002,7 @@
+@@ -1012,6 +1013,7 @@
esac
done
Modified: packages/scilab/branches/5.4/debian/patches/missingaddchapter.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/missingaddchapter.diff?rev=44865&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/missingaddchapter.diff (original)
+++ packages/scilab/branches/5.4/debian/patches/missingaddchapter.diff Mon May 21 17:16:09 2012
@@ -4,11 +4,10 @@
Missing addchapter.sce
-diff --git a/scilab/modules/call_scilab/help/en_US/addchapter.sce b/scilab/modules/call_scilab/help/en_US/addchapter.sce
-new file mode 100644
-index 0000000..29d4a54
---- /dev/null
-+++ b/scilab/modules/call_scilab/help/en_US/addchapter.sce
+Index: scilab-5.4.0-alpha-20122105-824511b/scilab/modules/call_scilab/help/en_US/addchapter.sce
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ scilab-5.4.0-alpha-20122105-824511b/scilab/modules/call_scilab/help/en_US/addchapter.sce 2012-05-21 14:59:51.000000000 +0200
@@ -0,0 +1,13 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2007-2008 - INRIA - Allan CORNET
Added: packages/scilab/branches/5.4/debian/patches/s390x.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/s390x.diff?rev=44865&op=file
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/s390x.diff (added)
+++ packages/scilab/branches/5.4/debian/patches/s390x.diff Mon May 21 17:16:09 2012
@@ -1,0 +1,32 @@
+Index: scilab-5.4.0-alpha-20122105-824511b/bin/scilab
+===================================================================
+--- scilab-5.4.0-alpha-20122105-824511b.orig/bin/scilab 2012-05-21 14:59:51.000000000 +0200
++++ scilab-5.4.0-alpha-20122105-824511b/bin/scilab 2012-05-21 14:59:51.000000000 +0200
+@@ -515,9 +515,12 @@
+ "ppc"|"powerpc"|"ppc64")
+ proc="ppc"
+ ;;
+- "s390"|"s390x")
++ "s390")
+ proc="s390"
+ ;;
++ "s390x")
++ proc="s390x"
++ ;;
+ armv*)
+ proc="arm"
+ ;;
+Index: scilab-5.4.0-alpha-20122105-824511b/m4/java.m4
+===================================================================
+--- scilab-5.4.0-alpha-20122105-824511b.orig/m4/java.m4 2012-05-21 14:59:41.000000000 +0200
++++ scilab-5.4.0-alpha-20122105-824511b/m4/java.m4 2012-05-21 14:59:51.000000000 +0200
+@@ -477,9 +477,6 @@
+ armv*)
+ machine=arm
+ ;;
+- s390x) # s390 arch can also returns s390x
+- machine=s390
+- ;;
+ sh*)
+ machine=sh
+ ;;
Modified: packages/scilab/branches/5.4/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/series?rev=44865&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/series (original)
+++ packages/scilab/branches/5.4/debian/patches/series Mon May 21 17:16:09 2012
@@ -2,3 +2,4 @@
javalibpath.diff
librarypath.diff
missingaddchapter.diff
+s390x.diff
Modified: packages/scilab/branches/5.4/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/rules?rev=44865&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/rules (original)
+++ packages/scilab/branches/5.4/debian/rules Mon May 21 17:16:09 2012
@@ -15,8 +15,8 @@
DEB_CONFIGURE_NORMAL_ARGS += --prefix=$(DEB_CONFIGURE_PREFIX) \
--with-pvm --with-fftw --enable-relocatable \
--with-umfpack --enable-build-localization \
- --with-install-help-xml --enable-build-help \
- --enable-compilation-tests
+ --with-install-help-xml --enable-build-help
+# --enable-compilation-tests
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-as-needed"
@@ -42,7 +42,7 @@
DEB_DH_MAKESHLIBS_ARGS_libscilab2-java = -n
DEB_DH_SHLIBDEPS_ARGS_libscilab-java = -Xusr/lib/jni/libjavasci.so
DEB_DH_SHLIBDEPS_ARGS_libscilab2-java = -Xusr/lib/jni/libjavasci2.so
-DEB_MAKE_CHECK_TARGET = check
+#DEB_MAKE_CHECK_TARGET = check
DEB_INSTALL_CHANGELOGS_ALL = CHANGES_5.3.X CHANGES_5.4.X
More information about the debian-science-commits
mailing list