r35867 - in /packages/scilab-toolboxes/scimax/trunk/debian: changelog control copyright patches/compilerErrorOnDollar.diff
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Sat Sep 26 11:17:08 UTC 2009
Author: sylvestre-guest
Date: Sat Sep 26 11:17:07 2009
New Revision: 35867
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35867
Log:
* Copyright file updated with two missing statements
* Missing build/runtime dep on maxima-share
* (and others) as #define are causing some issue to gcc under
Armel. Replaced by __ADD
Added:
packages/scilab-toolboxes/scimax/trunk/debian/patches/compilerErrorOnDollar.diff
Modified:
packages/scilab-toolboxes/scimax/trunk/debian/changelog
packages/scilab-toolboxes/scimax/trunk/debian/control
packages/scilab-toolboxes/scimax/trunk/debian/copyright
Modified: packages/scilab-toolboxes/scimax/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/scimax/trunk/debian/changelog?rev=35867&op=diff
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/changelog (original)
+++ packages/scilab-toolboxes/scimax/trunk/debian/changelog Sat Sep 26 11:17:07 2009
@@ -1,3 +1,12 @@
+scilab-scimax (2.0.1-2) unstable; urgency=low
+
+ * Copyright file updated with two missing statements
+ * Missing build/runtime dep on maxima-share
+ * $ADD (and others) as #define are causing some issue to gcc under
+ Armel. Replaced by __ADD
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 24 Sep 2009 10:32:27 +0200
+
scilab-scimax (2.0.1-1) unstable; urgency=low
* Initial release (Closes: #547581)
Modified: packages/scilab-toolboxes/scimax/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/scimax/trunk/debian/control?rev=35867&op=diff
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/control (original)
+++ packages/scilab-toolboxes/scimax/trunk/debian/control Sat Sep 26 11:17:07 2009
@@ -4,7 +4,7 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
Build-Depends: debhelper (>= 7), cdbs, scilab (>= 5.1.1),
- scilab-doc (>= 5.1.1), maxima, scilab-overload, bison, flex
+ scilab-doc (>= 5.1.1), maxima, scilab-overload, bison, flex, maxima-share
Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab-toolboxes/scimax/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scilab-toolboxes/scimax/trunk
@@ -13,7 +13,8 @@
Package: scilab-scimax
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, scilab (>= 5.1.1),
- scilab-overload, maxima
+ scilab-overload, maxima, maxima-share
+Recommends: scilab-scimax-doc
Description: Symbolic computations for Scilab based on Maxima
This toolbox is providing symbolic capabilities with the Scilab languages.
.
Modified: packages/scilab-toolboxes/scimax/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/scimax/trunk/debian/copyright?rev=35867&op=diff
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/copyright (original)
+++ packages/scilab-toolboxes/scimax/trunk/debian/copyright Sat Sep 26 11:17:07 2009
@@ -76,3 +76,17 @@
you should have received as part of this distribution. The terms
are also available at
http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+
+File: src/maxhelp/maxima-5.13.0-doc/maxima.texi
+
+Copyright: 1994,2001 William F. Schelter
+
+License: GPL
+
+
+File: help/buildhelp.sci
+
+Copyright: INRIA 2008
+
+License: Public domain
Added: packages/scilab-toolboxes/scimax/trunk/debian/patches/compilerErrorOnDollar.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/scimax/trunk/debian/patches/compilerErrorOnDollar.diff?rev=35867&op=file
==============================================================================
--- packages/scilab-toolboxes/scimax/trunk/debian/patches/compilerErrorOnDollar.diff (added)
+++ packages/scilab-toolboxes/scimax/trunk/debian/patches/compilerErrorOnDollar.diff Sat Sep 26 11:17:07 2009
@@ -1,0 +1,154 @@
+diff -ur scilab-scimax_2.0.1.orig/src/c/maxevalop.c scilab-scimax_2.0.1/src/c/maxevalop.c
+--- scilab-scimax_2.0.1.orig/src/c/maxevalop.c 2009-09-24 12:11:05.000000000 +0200
++++ scilab-scimax_2.0.1/src/c/maxevalop.c 2009-09-24 12:12:03.000000000 +0200
+@@ -104,18 +104,18 @@
+
+ switch (op)
+ {
+- case $ADD :
++ case __ADD :
+ Putc ('+', is);
+ return;
+- case $POW :
++ case __POW :
+ Putc ('^', is);
+ if (a) Putc ('^', is);
+ return;
+- case $MULT :
++ case __MULT :
+ if (a && b) Putc ('.', is);
+ else Putc ('*', is);
+ return;
+- case $DIV :
++ case __DIV :
+ if (b)
+ {
+ Putc (!a ? '*' : '.', is);
+@@ -125,10 +125,10 @@
+ }
+ else Putc ('/', is);
+ return;
+- case $SUB :
++ case __SUB :
+ Putc ('-', is);
+ return;
+- case $BACKSLASH :
++ case __BACKSLASH :
+ if (a)
+ {
+ Putc ('v', is);
+@@ -143,18 +143,18 @@
+ Putc ('_', is);
+ }
+ return;
+- case $PMULT :
++ case __PMULT :
+ Putc ('*', is);
+ return;
+- case $PDIV :
++ case __PDIV :
+ Putc ('/', is);
+ return;
+- case $PBACKSLASH :
++ case __PBACKSLASH :
+ Putc ('_', is);
+ Putc ('b', is);
+ Putc ('_', is);
+ return;
+- case $PPOW :
++ case __PPOW :
+ if (!b) Putc ('^', is);
+ else
+ {
+@@ -163,37 +163,37 @@
+ Putc ('_', is);
+ }
+ return;
+- case $FEEDBACK :
++ case __FEEDBACK :
+ Putc ('_', is);
+ Putc ('f', is);
+ Putc ('_', is);
+ return;
+- case $KRONPROD :
++ case __KRONPROD :
+ Putc ('_', is);
+ Putc ('k', is);
+ Putc ('_', is);
+ return;
+- case $LOW :
++ case __LOW :
+ Putc ('<', is);
+ return;
+- case $LEQ :
++ case __LEQ :
+ Putc ('<', is);
+ Putc ('=', is);
+ return;
+- case $GREAT :
++ case __GREAT :
+ Putc ('>', is);
+ return;
+- case $GEQ :
++ case __GEQ :
+ Putc ('>', is);
+ Putc ('=', is);
+ return;
+- case $NEQ :
++ case __NEQ :
+ Putc ('#', is);
+ return;
+- case $EQ :
++ case __EQ :
+ Putc ('=', is);
+ return;
+- case $AFFECT :
++ case __AFFECT :
+ Putc (':', is);
+ return;
+ }
+diff -ur scilab-scimax_2.0.1.orig/src/include/operateurs.h scilab-scimax_2.0.1/src/include/operateurs.h
+--- scilab-scimax_2.0.1.orig/src/include/operateurs.h 2009-09-24 12:11:05.000000000 +0200
++++ scilab-scimax_2.0.1/src/include/operateurs.h 2009-09-24 12:11:25.000000000 +0200
+@@ -58,22 +58,22 @@
+ #define EQ OP[17]
+ #define AFFECT OP[18]
+
+-#define $ADD 0
+-#define $POW 1
+-#define $MULT 2
+-#define $DIV 3
+-#define $SUB 4
+-#define $BACKSLASH 5
+-#define $PMULT 6
+-#define $PDIV 7
+-#define $PBACKSLASH 8
+-#define $PPOW 9
+-#define $FEEDBACK 10
+-#define $KRONPROD 11
+-#define $LOW 12
+-#define $LEQ 13
+-#define $GREAT 14
+-#define $GEQ 15
+-#define $NEQ 16
+-#define $EQ 17
+-#define $AFFECT 18
++#define __ADD 0
++#define __POW 1
++#define __MULT 2
++#define __DIV 3
++#define __SUB 4
++#define __BACKSLASH 5
++#define __PMULT 6
++#define __PDIV 7
++#define __PBACKSLASH 8
++#define __PPOW 9
++#define __FEEDBACK 10
++#define __KRONPROD 11
++#define __LOW 12
++#define __LEQ 13
++#define __GREAT 14
++#define __GEQ 15
++#define __NEQ 16
++#define __EQ 17
++#define __AFFECT 18
More information about the debian-science-commits
mailing list