r35712 - in /packages/scilab/trunk/debian: 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
Wed May 13 12:11:54 UTC 2009
Author: sylvestre-guest
Date: Wed May 13 12:11:54 2009
New Revision: 35712
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35712
Log:
version 5.1.1-4
Modified:
packages/scilab/trunk/debian/patches/modelicac-not-available.diff
packages/scilab/trunk/debian/patches/ocaml-not-available.diff
packages/scilab/trunk/debian/rules
packages/scilab/trunk/debian/scilab-bin.install
Modified: 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=35712&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/modelicac-not-available.diff (original)
+++ packages/scilab/trunk/debian/patches/modelicac-not-available.diff Wed May 13 12:11:54 2009
@@ -1,11 +1,59 @@
+diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/build_block.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/build_block.sci
+--- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/build_block.sci 2009-04-14 09:31:05.000000000 +0200
++++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/build_block.sci 2009-04-30 11:28:37.000000000 +0200
+@@ -72,7 +72,7 @@
+ //++ Check that modelica compiler is available
+ //++ Otherwise, give some feedback and quit
+ if ~with_modelica_compiler() then
+- messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "build_block"),"modal","error");
++ messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.")+" This is probably due to the non support of ocamlopt on your architecture.", "build_block"),"modal","error");
+ ok = %f
+ end
+
+diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/compile_modelica.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/compile_modelica.sci
--- 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
++++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/compile_modelica.sci 2009-04-30 11:28:37.000000000 +0200
+@@ -25,7 +25,7 @@
+ //++ Check that modelica compiler is available
+ //++ Otherwise, give some feedback and quit
+ if ~with_modelica_compiler() then
+- messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "compile_modelica"),"modal","error");
++ messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.")+" This is probably due to the non support of ocamlopt on your architecture.", "compile_modelica"),"modal","error");
+ name = ''
+ ok = %f, nx = 0, nin = 0, nout = 0, ng = 0, nm = 0, nz = 0; return
+ end
@@ -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");
++ 'The modelica compiler is not available on this arch because of non-support of ocamlopt 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
+diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/genmoc.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci
+--- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/genmoc.sci 2009-04-14 09:31:05.000000000 +0200
++++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci 2009-04-30 11:32:34.000000000 +0200
+@@ -29,7 +29,7 @@
+ //++ Check that modelica compiler is available
+ //++ Otherwise, give some feedback and quit
+ if ~with_modelica_compiler() then
+- error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.\n"), "genmoc"))
++ error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.\n")+" This is probably due to the non support of ocamlopt on your architecture.", "genmoc"))
+ return
+ end
+
+Seulement dans scilab-5.1.1/modules/scicos/macros/scicos_scicos: genmoc.sci.orig
+Seulement dans scilab-5.1.1/modules/scicos/macros/scicos_scicos: genmoc.sci.rej
+diff -ur scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/MODCOM.sci scilab-5.1.1/modules/scicos/macros/scicos_scicos/MODCOM.sci
+--- scilab-5.1.1.orig/modules/scicos/macros/scicos_scicos/MODCOM.sci 2009-04-14 09:31:05.000000000 +0200
++++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/MODCOM.sci 2009-04-30 11:28:37.000000000 +0200
+@@ -80,7 +80,7 @@
+ //++ Check that modelica compiler is available
+ //++ Otherwise, give some feedback and quit
+ if ~with_modelica_compiler() then
+- messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable."), "MODCOM"),"modal","error");
++ messagebox(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.")+" This is probably due to the non support of ocamlopt on your architecture.", "MODCOM"),"modal","error");
+ ok = %f
+ break
+ end
Modified: 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=35712&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/ocaml-not-available.diff (original)
+++ packages/scilab/trunk/debian/patches/ocaml-not-available.diff Wed May 13 12:11:54 2009
@@ -34,3 +34,41 @@
echo "Not using Scicos"
fi
+--- scilab-5.1.1.orig/m4/ocaml.m4
++++ scilab-5.1.1/ocaml.m4
+@@ -12,30 +12,25 @@ AC_DEFUN([AC_CHECK_PROG_OCAML],[
+ OCAMLDEP=
+ AC_CHECK_PROG(OCAMLC,ocamlc,ocamlc,no)
+ if test "$OCAMLC" = no; then
+- AC_MSG_ERROR([ocamlc not found. Mandatory to build Scicos (Use --without-ocaml to disable the Modelica compiler).])
++ AC_MSG_WARN([ocamlc not found. Mandatory to build the Scicos modelica compiler (Use --without-ocaml to disable the Modelica compiler).])
+ fi
+ AC_CHECK_PROG(OCAMLOPT,ocamlopt,ocamlopt,no)
+ if test "$OCAMLOPT" = no; then
+- AC_MSG_ERROR([ocamlopt not found. Mandatory to build Scicos.])
++ AC_MSG_WARN([ocamlopt not found. Mandatory to build the Scicos modelica compiler.])
+ fi
+ AC_CHECK_PROG(OCAMLDEP,ocamldep,ocamldep,no)
+ if test "$OCAMLDEP" = no; then
+- AC_MSG_ERROR([ocamldep not found. Mandatory to build Scicos.])
++ AC_MSG_WARN([ocamldep not found. Mandatory to build the Scicos modelica compiler.])
+ fi
+ AC_CHECK_PROG(OCAMLYACC,ocamlyacc,ocamlyacc,no)
+ if test "$OCAMLYACC" = no; then
+- AC_MSG_ERROR([ocamlyacc not found. Mandatory to build Scicos.])
++ AC_MSG_WARN([ocamlyacc not found. Mandatory to build the Scicos modelica compiler.])
+ fi
+ AC_CHECK_PROG(OCAMLLEX,ocamllex,ocamllex,no)
+ if test "$OCAMLLEX" = no; then
+- AC_MSG_ERROR([ocamllex not found. Mandatory to build Scicos.])
++ AC_MSG_WARN([ocamllex not found. Mandatory to build the Scicos modelica compiler.])
+ fi
+ AC_DEFINE([WITH_OCAML],[],[With OCAML])
+- OCAMLC=ocamlc
+- OCAMLOPT=ocamlopt
+- OCAMLDEP=ocamldep
+- OCAMLYACC=ocamlyacc
+- OCAMLLEX=ocamllex
+
+ AC_SUBST(OCAMLC)
+ AC_SUBST(OCAMLOPT)
Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=35712&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Wed May 13 12:11:54 2009
@@ -40,7 +40,7 @@
# Remove empty directories
find $(DEB_DESTDIR)/usr/share/scilab -type d -empty -delete
# Remove extra license files to make lintian happier
-#�See debian/copyright for them
+# See debian/copyright for them
rm $(DEB_DESTDIR)usr/share/scilab/modules/*/license.txt
rm $(DEB_DESTDIR)usr/share/scilab/contrib/toolbox_skeleton/license.txt
rm $(DEB_DESTDIR)usr/share/scilab/modules/tclsci/tcl/BWidget-*/LICENSE.txt
@@ -99,6 +99,13 @@
mkdir -p $(CURDIR)/debian/scilab/usr/share/scilab/
mv debian/tmp/usr/share/scilab/icons/ $(CURDIR)/debian/scilab/usr/share/scilab/
+# Move binaries
+ mkdir -p $(CURDIR)/debian/scilab-bin/usr/bin
+ mv $(CURDIR)/debian/tmp/usr/bin/scilab-bin $(CURDIR)/debian/tmp/usr/bin/intersci $(CURDIR)/debian/scilab-bin/usr/bin/
+ if test -s $(CURDIR)/debian/tmp/usr/bin/modelicac; then \
+ mv $(CURDIR)/debian/tmp/usr/bin/modelicac $(CURDIR)/debian/scilab-bin/usr/bin/; \
+ fi
+
binary-install/scilab::
dh_desktop -p scilab
Modified: packages/scilab/trunk/debian/scilab-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-bin.install?rev=35712&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-bin.install (original)
+++ packages/scilab/trunk/debian/scilab-bin.install Wed May 13 12:11:54 2009
@@ -1,2 +1,1 @@
-debian/tmp/usr/bin/
debian/tmp/usr/lib/
More information about the debian-science-commits
mailing list