r35972 - in /packages/scilab/branches/5.2/debian: changelog patches/autoconf-libs-filed-updated.diff patches/modelicac-not-available.diff patches/ocaml-not-available.diff patches/typo.diff

sylvestre-guest at users.alioth.debian.org sylvestre-guest at users.alioth.debian.org
Mon Nov 9 15:13:38 UTC 2009


Author: sylvestre-guest
Date: Mon Nov  9 15:13:32 2009
New Revision: 35972

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35972
Log:
Some other patches have been also applied upstream

Removed:
    packages/scilab/branches/5.2/debian/patches/autoconf-libs-filed-updated.diff
    packages/scilab/branches/5.2/debian/patches/ocaml-not-available.diff
    packages/scilab/branches/5.2/debian/patches/typo.diff
Modified:
    packages/scilab/branches/5.2/debian/changelog
    packages/scilab/branches/5.2/debian/patches/modelicac-not-available.diff

Modified: packages/scilab/branches/5.2/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.2/debian/changelog?rev=35972&op=diff
==============================================================================
--- packages/scilab/branches/5.2/debian/changelog (original)
+++ packages/scilab/branches/5.2/debian/changelog Mon Nov  9 15:13:32 2009
@@ -4,7 +4,8 @@
     libjgraphx)
   * alphabuild.diff, exitincode.diff, fpu_control.diff, jvm-powerpc.diff
     javaruntimedetection.diff, malloc.diff, z_java_debug.diff, 
-    z_mipsel_arm_mgmt.diff removed (applied upstream)
+    z_mipsel_arm_mgmt.diff, autoconf-libs-filed-updated.diff, 
+    ocaml-not-available.diff, typo.diff removed (applied upstream)
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 07 Nov 2009 16:34:48 +0100
 

Modified: packages/scilab/branches/5.2/debian/patches/modelicac-not-available.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.2/debian/patches/modelicac-not-available.diff?rev=35972&op=diff
==============================================================================
--- packages/scilab/branches/5.2/debian/patches/modelicac-not-available.diff (original)
+++ packages/scilab/branches/5.2/debian/patches/modelicac-not-available.diff Mon Nov  9 15:13:32 2009
@@ -31,20 +31,6 @@
          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
@@ -57,3 +43,15 @@
          ok = %f
          break
        end
+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-11-09 15:53:03.000000000 +0100
++++ scilab-5.1.1/modules/scicos/macros/scicos_scicos/genmoc.sci	2009-11-09 15:53:37.000000000 +0100
+@@ -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."), "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
+ 




More information about the debian-science-commits mailing list