r46332 - in /packages/scilab/branches/5.5/debian: changelog control patches/disable-static-libstdc.patch patches/librarypath.diff patches/series rules scilab-full-bin.install
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Wed Oct 2 18:15:31 UTC 2013
Author: sylvestre
Date: Wed Oct 2 18:15:30 2013
New Revision: 46332
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46332
Log:
* New upstream release
* Enable MPI features
Added:
packages/scilab/branches/5.5/debian/patches/disable-static-libstdc.patch
Modified:
packages/scilab/branches/5.5/debian/changelog
packages/scilab/branches/5.5/debian/control
packages/scilab/branches/5.5/debian/patches/librarypath.diff
packages/scilab/branches/5.5/debian/patches/series
packages/scilab/branches/5.5/debian/rules
packages/scilab/branches/5.5/debian/scilab-full-bin.install
Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=46332&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog (original)
+++ packages/scilab/branches/5.5/debian/changelog Wed Oct 2 18:15:30 2013
@@ -1,6 +1,7 @@
-scilab (5.5.0-1) unstable; urgency=low
-
- * Packaging of 5.5.0 release
+scilab (5.5.0~beta-1-1~exp1) experimental; urgency=low
+
+ * New upstream release
+ * Enable MPI features
-- Sylvestre Ledru <sylvestre at debian.org> Wed, 21 Aug 2013 14:13:14 +0200
Modified: packages/scilab/branches/5.5/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/control?rev=46332&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/control (original)
+++ packages/scilab/branches/5.5/debian/control Wed Oct 2 18:15:30 2013
@@ -26,6 +26,8 @@
libscirenderer-java (>= 1.1.0),
# Xcos
libjgraphx-java (>= 1.8.0.0), libhdf5-dev (>= 1.8.8),
+# MPI
+ mpi-default-dev,
# Unitary testing
ant-optional, junit4, libcobertura-java
Standards-Version: 3.9.4
@@ -155,7 +157,6 @@
fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
javahelp2, libjgraphx-java (>= 1.8.0.0), libjgoodies-looks-java,
libskinlf-java, ${misc:Depends}, libscirenderer-java (>= 1.1.0)
-Recommends: pvm
Replaces: scilab (<< 5.0), scilab-bin, scilab-minimal-bin (<< 5.4.1-3), libscilab2-java (<< 5.4.1-4)
Breaks: scilab-minimal-bin (<< 5.4.1-3), libscilab2-java (<< 5.4.1-4)
Description: Scientific software package for numerical computations (all binary files)
Added: packages/scilab/branches/5.5/debian/patches/disable-static-libstdc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/disable-static-libstdc.patch?rev=46332&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/disable-static-libstdc.patch (added)
+++ packages/scilab/branches/5.5/debian/patches/disable-static-libstdc.patch Wed Oct 2 18:15:30 2013
@@ -0,0 +1,36 @@
+Index: scilab-5.5.0-beta-1/configure
+===================================================================
+--- scilab-5.5.0-beta-1.orig/configure 2013-10-02 18:10:44.383780466 +0200
++++ scilab-5.5.0-beta-1/configure 2013-10-02 18:10:44.379780466 +0200
+@@ -40031,6 +40031,13 @@
+ compiler_manage_static_libs=no
+ USE_STATIC_SYSTEM_LIB=yes
+
++
++if test "x$enable_static_system_lib" == "xno"; then
++# The user ask for an explicit disable.
++ USE_STATIC_SYSTEM_LIB=no
++fi
++
++
+ LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5
+ $as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; }
+Index: scilab-5.5.0-beta-1/m4/compiler.m4
+===================================================================
+--- scilab-5.5.0-beta-1.orig/m4/compiler.m4 2013-10-02 18:10:44.383780466 +0200
++++ scilab-5.5.0-beta-1/m4/compiler.m4 2013-10-02 18:10:44.379780466 +0200
+@@ -38,6 +38,13 @@
+ compiler_manage_static_libs=no
+ USE_STATIC_SYSTEM_LIB=yes
+
++
++if test "x$enable_static_system_lib" == "xno"; then
++# The user ask for an explicit disable.
++ USE_STATIC_SYSTEM_LIB=no
++fi
++
++
+ LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
+ AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
+ AC_LANG_PUSH(C++)
Modified: packages/scilab/branches/5.5/debian/patches/librarypath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/librarypath.diff?rev=46332&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/librarypath.diff (original)
+++ packages/scilab/branches/5.5/debian/patches/librarypath.diff Wed Oct 2 18:15:30 2013
@@ -1,8 +1,8 @@
-Index: scilab-5.5.0/bin/scilab
+Index: scilab-5.5.0-beta-1/bin/scilab
===================================================================
---- scilab-5.5.0.orig/bin/scilab 2013-08-20 10:56:24.000000000 +0200
-+++ scilab-5.5.0/bin/scilab 2013-08-20 10:56:24.000000000 +0200
-@@ -754,7 +754,7 @@
+--- scilab-5.5.0-beta-1.orig/bin/scilab 2013-10-02 18:10:40.883780471 +0200
++++ scilab-5.5.0-beta-1/bin/scilab 2013-10-02 18:10:40.879780471 +0200
+@@ -768,7 +768,7 @@
if test -d $SCI/lib/thirdparty; then
SCILIB=$SCI/lib/thirdparty:$SCILIB;
fi
@@ -11,7 +11,7 @@
case $OS in
*darwin* | *Darwin*) # MacOS X
-@@ -798,6 +798,7 @@
+@@ -812,6 +812,7 @@
*)
esac
@@ -19,7 +19,7 @@
if test $SCIVERBOSE -ne 0; then
echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
-@@ -1069,6 +1070,7 @@
+@@ -1084,6 +1085,7 @@
esac
done
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=46332&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series (original)
+++ packages/scilab/branches/5.5/debian/patches/series Wed Oct 2 18:15:30 2013
@@ -1,4 +1,4 @@
adddemo.diff
librarypath.diff
missingaddchapter.diff
-
+disable-static-libstdc.patch
Modified: packages/scilab/branches/5.5/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/rules?rev=46332&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/rules (original)
+++ packages/scilab/branches/5.5/debian/rules Wed Oct 2 18:15:30 2013
@@ -17,7 +17,8 @@
--with-fftw --enable-relocatable \
--with-umfpack --enable-build-localization \
--with-install-help-xml --enable-build-help \
- --with-tcl-library=/usr/lib/$(DEB_HOST_MULTIARCH)
+ --with-tcl-library=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --enable-mpi --disable-static-system-lib
# --enable-compilation-tests
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-as-needed"
Modified: packages/scilab/branches/5.5/debian/scilab-full-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/scilab-full-bin.install?rev=46332&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/scilab-full-bin.install (original)
+++ packages/scilab/branches/5.5/debian/scilab-full-bin.install Wed Oct 2 18:15:30 2013
@@ -17,3 +17,4 @@
debian/tmp/usr/lib/scilab/libscipreferences.*
debian/tmp/usr/lib/scilab/libscitypes.*
debian/tmp/usr/lib/scilab/libscicommons.*
+debian/tmp/usr/lib/scilab/libsciexternal_objects_java.*
More information about the debian-science-commits
mailing list