r35699 - in /packages/scilab/trunk/debian: changelog patches/modelicac-not-available.diff patches/ocaml-not-available.diff rules scilab-bin.install
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Tue Apr 28 18:58:50 UTC 2009
Author: sylvestre-guest
Date: Tue Apr 28 18:58:50 2009
New Revision: 35699
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35699
Log:
* librefblas3-dev does not exist (yet). Thanks to Jose Ramon
* Do not stop when ocamlopt is not available on the arch
(ocaml-not-available.diff)
* Provide a clear error message for archs where modelicac compiler is
not available (modelicac-not-available.diff)
* scilab startup script moved from package scilab => scilab-bin
(because of
the ocamlopt problem, I cannot predict if modelicac will be
available or
not. Therefor, I ship usr/bin/ instead of binary per binary. This
will
also simplifies the packaging of Scilab 5.2)
Added:
packages/scilab/trunk/debian/patches/modelicac-not-available.diff
packages/scilab/trunk/debian/patches/ocaml-not-available.diff
Modified:
packages/scilab/trunk/debian/changelog
packages/scilab/trunk/debian/rules
packages/scilab/trunk/debian/scilab-bin.install
Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35699&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Tue Apr 28 18:58:50 2009
@@ -1,3 +1,17 @@
+scilab (5.1.1-4) unstable; urgency=low
+
+ * librefblas3-dev does not exist (yet). Thanks to Jose Ramon
+ * Do not stop when ocamlopt is not available on the arch
+ (ocaml-not-available.diff)
+ * Provide a clear error message for archs where modelicac compiler is
+ not available (modelicac-not-available.diff)
+ * scilab startup script moved from package scilab => scilab-bin (because of
+ the ocamlopt problem, I cannot predict if modelicac will be available or
+ not. Therefor, I ship usr/bin/ instead of binary per binary. This will
+ also simplifies the packaging of Scilab 5.2)
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Tue, 28 Apr 2009 18:47:03 +0200
+
scilab (5.1.1-3) unstable; urgency=low
* Fix warnings in the manpages (modelicac.1 & scilab.1)
@@ -6,7 +20,7 @@
* Encoding removed from scilab.desktop (it is now the default encoding)
* call_scilab documentation was not correctly loaded (missingaddchapter.diff)
* change of the order of the dependencies of the numerical deps (didn't work
- buildd)
+ buildd) (Closes: #525935)
* Build-dep atlas3-base-dev renamed to libatlas-base-dev
-- Sylvestre Ledru <sylvestre.ledru at inria.fr> Mon, 27 Apr 2009 14:51:57 +0200
Added: packages/scilab/trunk/debian/patches/modelicac-not-available.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/modelicac-not-available.diff?rev=35699&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/modelicac-not-available.diff (added)
+++ packages/scilab/trunk/debian/patches/modelicac-not-available.diff Tue Apr 28 18:58:50 2009
@@ -1,0 +1,11 @@
+--- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/compile_modelica.sci 2009-04-14 09:31:05.000000000 +0200
++++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/compile_modelica.sci 2009-04-28 20:55:01.000000000 +0200
+@@ -145,7 +145,7 @@
+ MSG1; ..
+ 'Please read the error message in the Scilab window'; ..
+ ' '; ..
+- 'Please install the Modelica translator (available at www.scicos.org) in ""SCI' + filesep() + 'bin"" and try again'],"modal","error");
++ 'The modelica compiler is not available on this arch because of non-support of ocaml for this architecture'],"modal","error");
+ ok = %f, nx = 0, nin = 0, nout = 0, ng = 0, nm = 0, nz = 0; return
+ end // if_translator_exists
+ end // if_modelicac_fails_then_use_translator
Added: packages/scilab/trunk/debian/patches/ocaml-not-available.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/ocaml-not-available.diff?rev=35699&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/ocaml-not-available.diff (added)
+++ packages/scilab/trunk/debian/patches/ocaml-not-available.diff Tue Apr 28 18:58:50 2009
@@ -1,0 +1,36 @@
+--- scilab-5.1.1.orig/configure.ac 2009-04-14 09:30:40.000000000 +0200
++++ scilab-5.1.1/configure.ac 2009-04-28 19:19:41.000000000 +0200
+@@ -763,7 +763,7 @@
+ ### If isinf exists or not (used to not be the case under Solaris)
+ ### See bug #4164
+ AC_CHECK_FUNC([isinf],,[
+- AC_DEFINE([isinf(x)],[return !finite(x) && x==x;],[Provide a macro to do isinf])
++ AC_DEFINE([isinf(x)],[(!finite(x) && x==x)],[Provide a macro to do isinf])
+ ])
+
+ LDFLAGS="$save_LDFLAGS"
+@@ -885,7 +885,7 @@
+ fi
+ AC_SUBST(SCICOS_ENABLE)
+
+-AM_CONDITIONAL(OCAML, test "$with_ocaml" != no)
++AM_CONDITIONAL(OCAML, test "$with_ocaml" != no -a "$OCAMLC" != no -a "$OCAMLOPT" != no)
+ AM_CONDITIONAL(SCICOS, test "$with_scicos" != no -a "$with_gui" != no)
+
+
+@@ -1424,10 +1424,14 @@
+ if test $SCICOS_ENABLE = yes; then
+ echo "Scicos enable"
+ echo ""
++if test "$with_ocaml" != no -a "$OCAMLC" != no -a "$OCAMLOPT" != no; then
+ echo "Ocaml Configuration (for Modelica compiler):"
+ echo "OCAMLC ............. = $OCAMLC"
+ echo "OCAMLOPT ........... = $OCAMLOPT"
+ echo "OCAMLDEP ........... = $OCAMLDEP"
++else
++ echo "Will not build Modelica compiler"
++fi
+ else
+ echo "Not using Scicos"
+ fi
+
Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=35699&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Tue Apr 28 18:58:50 2009
@@ -3,6 +3,8 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_AUTO_UPDATE_AUTOCONF=yes
# Detect the arch (with the namming of Sun)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
Modified: packages/scilab/trunk/debian/scilab-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-bin.install?rev=35699&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-bin.install (original)
+++ packages/scilab/trunk/debian/scilab-bin.install Tue Apr 28 18:58:50 2009
@@ -1,4 +1,2 @@
-debian/tmp/usr/bin/scilab-bin
-debian/tmp/usr/bin/modelicac
-debian/tmp/usr/bin/intersci
+debian/tmp/usr/bin/
debian/tmp/usr/lib/
More information about the debian-science-commits
mailing list