r36902 - in /packages/scilab/branches/5.3/debian: changelog control copyright libscilab-java.lintian-overrides patches/adddemo.diff patches/modelicac-not-available.diff patches/xarmjavadetection.diff scilab-full-bin.install scilab-minimal-bin.install

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Tue Sep 28 19:42:53 UTC 2010 

Author: sylvestre
Date: Tue Sep 28 19:42:50 2010
New Revision: 36902

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36902
Log:
5.3.0 betaX

Added:
    packages/scilab/branches/5.3/debian/patches/xarmjavadetection.diff
Modified:
    packages/scilab/branches/5.3/debian/changelog
    packages/scilab/branches/5.3/debian/control
    packages/scilab/branches/5.3/debian/copyright
    packages/scilab/branches/5.3/debian/libscilab-java.lintian-overrides
    packages/scilab/branches/5.3/debian/patches/adddemo.diff
    packages/scilab/branches/5.3/debian/patches/modelicac-not-available.diff
    packages/scilab/branches/5.3/debian/scilab-full-bin.install
    packages/scilab/branches/5.3/debian/scilab-minimal-bin.install

Modified: packages/scilab/branches/5.3/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/changelog?rev=36902&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/changelog (original)
+++ packages/scilab/branches/5.3/debian/changelog Tue Sep 28 19:42:50 2010
@@ -1,8 +1,42 @@
-scilab (5.3.0-beta-1-3) experimental; urgency=low
+scilab (5.3.0-beta-3-2) experimental; urgency=low
+
+  * Missing dep on libjlatexmath-fop-java
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 17 Sep 2010 18:11:22 +0200
+
+scilab (5.3.0-beta-3-1) experimental; urgency=low
 
   * New upstream release
-
- -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 06 Jul 2010 20:21:33 +0200
+  * jhdf2.6.diff addchapter.diff full_support.diff sparc64.diff 
+    z_cpudetection.diff better-feedback-on-lib-error.diff
+    test_run_permission.diff renesas-sh.diff applied upstream.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 12 Sep 2010 13:42:22 +0200
+
+scilab (5.2.2-5) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * Fix JVM detection for armv<anything> machines (Closes: #596509)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 12 Sep 2010 11:14:58 +0200
+
+scilab (5.2.2-4) unstable; urgency=low
+
+  * Fix a FTBFS under powerpc (conflicting declaration of basename)
+    basename.diff
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 16 Aug 2010 22:20:42 +0200
+
+scilab (5.2.2-3) unstable; urgency=low
+
+  * Remove option -fwritable-string. writable-string.diff (Closes: #593114)
+  * Fix a problem in the detection of sparc for sivp sparcstartup.diff
+    (Closes: #591541)
+  * Update copyright file to fix lintian warning:
+    copyright-refers-to-deprecated-bsd-license-file
+  * Standards-Version updated to version 3.9.1
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 16 Aug 2010 16:03:13 +0200
 
 scilab (5.2.2-2) unstable; urgency=low
 

Modified: packages/scilab/branches/5.3/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/control?rev=36902&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/control (original)
+++ packages/scilab/branches/5.3/debian/control Tue Sep 28 19:42:50 2010
@@ -20,19 +20,19 @@
  pvm-dev, fftw3-dev | libfftw3-dev, libsuitesparse-dev (>= 3.4.0), 
  libmatio-dev,
 # latex rendering
- libjlatexmath-java (>= 0.8), 
+ libjlatexmath-java (>= 0.9.3),  libjlatexmath-fop-java (>= 0.9.3),
 # Xcos
- libjgraphx-java (>= 1.2.0.8), libhdf5-serial-dev, libjhdf5-java (>= 2.6)
-Standards-Version: 3.8.4
+ libjgraphx-java (>= 1.4.0.2), libhdf5-serial-dev, libjhdf5-java (>= 2.6)
+Standards-Version: 3.9.1
 Homepage: http://www.scilab.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scilab/trunk/
 
 Package: scilab-cli
 Architecture: all
-Depends: scilab-minimal-bin (>= ${source:Version}), 
+Depends: scilab-minimal-bin (= ${source:Version}), 
  scilab-data (= ${binary:Version}), ${misc:Depends}, 
- scilab-include (>= ${source:Version})
+ scilab-include (= ${source:Version})
 # scilab-include is installed by default since it is widely used by many
 # toolboxes
 Recommends: scilab-sivp (>= 5.0.0)
@@ -51,9 +51,10 @@
 
 Package: scilab
 Architecture: all
-Depends: scilab-cli (>= ${source:Version}), ${misc:Depends}, scilab-full-bin
+Depends: scilab-cli (= ${source:Version}), ${misc:Depends}, scilab-full-bin
 Recommends: scilab-doc (= ${binary:Version}), 
-Suggests: scilab-doc-fr (= ${binary:Version}), scilab-doc-pt-br (= ${binary:Version}),
+Suggests: scilab-doc-fr (= ${binary:Version}), 
+ scilab-doc-pt-br (= ${binary:Version})
 Description: Scientific software package for numerical computations
  Scilab is a matrix-based scientific software package.
  Scilab contains hundreds of built-in mathematical functions, rich
@@ -110,9 +111,10 @@
 Architecture: any
 Depends: ${shlibs:Depends}, scilab-minimal-bin (= ${binary:Version}),
  libflexdock-java, libjogl-java (>= 1.1.1), libjrosetta-java (>= 1.0.1),
- libjlatexmath-java, libjeuclid-core-java, libbatik-java (>= 1.7), 
- fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
- javahelp2, libjgraphx-java (>= 1.2.0.8), libjhdf5-java (>= 2.6), 
+ libjlatexmath-java (>= 0.9.3), libjlatexmath-fop-java (>= 0.9.3),
+ libjeuclid-core-java, libbatik-java (>= 1.7), fop (>= 0.95),
+ libsaxon-java, libavalon-framework-java, docbook-xsl,
+ javahelp2, libjgraphx-java (>= 1.4.0.2), libjhdf5-java (>= 2.6), 
  ${misc:Depends}
 Recommends: pvm
 Replaces: scilab (<< 5.0), scilab-bin
@@ -143,8 +145,8 @@
 Section: debug
 Priority: extra
 Pre-Depends: ${dpkg:Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-minimal-bin (>= ${source:Version})
-Suggests: scilab (>= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-minimal-bin (= ${source:Version})
+Suggests: scilab (= ${source:Version})
 Description: Scientific software package (scilab-cli debugging symbols)
  Scilab is a matrix-based scientific software package.
  Scilab contains hundreds of built-in mathematical functions, rich
@@ -159,8 +161,8 @@
 Section: debug
 Priority: extra
 Pre-Depends: ${dpkg:Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-full-bin (>= ${source:Version})
-Suggests: scilab (>= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-full-bin (= ${source:Version})
+Suggests: scilab (= ${source:Version})
 Description: Scientific software package (scilab debugging symbols)
  Scilab is a matrix-based scientific software package.
  Scilab contains hundreds of built-in mathematical functions, rich 
@@ -173,7 +175,7 @@
 Package: libscilab-java
 Section: java
 Architecture: any
-Depends: ${shlibs:Depends}, scilab-full-bin (>= ${source:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, scilab-full-bin (= ${source:Version}), ${misc:Depends}
 Description: Scientific software package for numerical computations (Java API)
  Scilab is a matrix-based scientific software package.
  Scilab contains hundreds of built-in mathematical functions, rich 
@@ -186,7 +188,7 @@
 
 Package: scilab-doc
 Section: doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, scilab (= ${binary:Version})
 Architecture: all
 Description: Scientific software package (english documentations)
  Scilab is a matrix-based scientific software package.
@@ -200,7 +202,7 @@
 Package: scilab-doc-fr
 Section: doc
 Architecture: all
-Depends: scilab-doc, ${misc:Depends}
+Depends: scilab-doc, ${misc:Depends}, scilab (= ${binary:Version})
 Description: Scientific software package (french documentation)
  Scilab is a matrix-based scientific software package.
  Scilab contains hundreds of built-in mathematical functions, rich 
@@ -213,7 +215,7 @@
 Package: scilab-doc-pt-br
 Section: doc
 Architecture: all
-Depends: scilab-doc, ${misc:Depends}
+Depends: scilab-doc, ${misc:Depends}, scilab (= ${binary:Version})
 Description: Scientific software package (Brazilian Portuguese documentation)
  Scilab is a matrix-based scientific software package.
  Scilab contains hundreds of built-in mathematical functions, rich 
@@ -226,7 +228,7 @@
 
 Package: scilab-test
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, scilab-cli (= ${binary:Version})
 Description: Scientific software package for numerical computations (test files)
  Scilab is a matrix-based scientific software package.
  Scilab contains hundreds of built-in mathematical functions, rich 

Modified: packages/scilab/branches/5.3/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/copyright?rev=36902&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/copyright (original)
+++ packages/scilab/branches/5.3/debian/copyright Tue Sep 28 19:42:50 2010
@@ -530,8 +530,6 @@
 /usr/share/common-licenses/GPL
 The complete text of the Artistic License can be found in
 /usr/share/common-licenses/Artistic
-The complete text of the BSD License can be found in
-/usr/share/common-licenses/BSD
 
 Here is the list of other licenses by libs:
 
@@ -932,6 +930,21 @@
 
 License: 
 BSD license
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+    This product includes software developed by the University of
+    California, Berkeley and its contributors.
+ 4. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
 
 Linpack:
 ========
@@ -1217,9 +1230,24 @@
 
 Copyright:
 2002-2004 Samit Basu
-
-License:
-BSD
+1997-2002, Makoto Matsumoto and Takuji Nishimura
+
+License:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ 3. The names of its contributors may not be used to endorse or promote 
+ products derived from this software without specific prior written 
+ permission.
+
 
 kiss:
 =====

Modified: packages/scilab/branches/5.3/debian/libscilab-java.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/libscilab-java.lintian-overrides?rev=36902&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/libscilab-java.lintian-overrides (original)
+++ packages/scilab/branches/5.3/debian/libscilab-java.lintian-overrides Tue Sep 28 19:42:50 2010
@@ -1,5 +1,5 @@
 # rpath is used to point to Scilab libraries
-binary-or-shlib-defines-rpath ./usr/lib/jni/libjavasci.so.5.0.2 /usr/lib/scilab
+binary-or-shlib-defines-rpath ./usr/lib/jni/libjavasci.so.5.0.3 /usr/lib/scilab
 # shlibdeps disabled on libscilab-java 
-missing-dependency-on-libc needed by ./usr/lib/jni/libjavasci.so.5.0.2
+missing-dependency-on-libc needed by ./usr/lib/jni/libjavasci.so.5.0.3
 

Modified: packages/scilab/branches/5.3/debian/patches/adddemo.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/patches/adddemo.diff?rev=36902&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/patches/adddemo.diff (original)
+++ packages/scilab/branches/5.3/debian/patches/adddemo.diff Tue Sep 28 19:42:50 2010
@@ -5,10 +5,10 @@
    
    path=pathconvert(path,%f,%t);
    
--  if fileinfo(path)==[] then
+-  if ~isfile(path) then
 -    error(msprintf(gettext("%s: The file %s does not exist.\n"),"add_demo",path));
 -  end
-+  if fileinfo(path) <> [] then
++  if ~isfile(path) then
    
    if isdir(path) then 
      error(msprintf(gettext("%s: Wrong input argument #%d: Path to a scilab script file expected.\n"),"add_demo",2));
@@ -20,4 +20,4 @@
 +  end
    clear demolist
    
- endfunction
+ endfunction

Modified: packages/scilab/branches/5.3/debian/patches/modelicac-not-available.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/patches/modelicac-not-available.diff?rev=36902&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/patches/modelicac-not-available.diff (original)
+++ packages/scilab/branches/5.3/debian/patches/modelicac-not-available.diff Tue Sep 28 19:42:50 2010
@@ -1,36 +1,13 @@
-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/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
-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
+Index: scilab-5.3.0-beta-3/modules/scicos/macros/scicos_scicos/genmoc.sci
+===================================================================
+--- scilab-5.3.0-beta-3.orig/modules/scicos/macros/scicos_scicos/genmoc.sci	2010-09-12 15:24:04.000000000 +0200
++++ scilab-5.3.0-beta-3/modules/scicos/macros/scicos_scicos/genmoc.sci	2010-09-12 15:24:27.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."), "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"))
++    error(sprintf(gettext("%s: Error: Modelica compiler (MODELICAC) is unavailable.")+" This is probably due to the non support of ocamlopt on your architecture.", "genmoc"))
      return
    end
  

Added: packages/scilab/branches/5.3/debian/patches/xarmjavadetection.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/patches/xarmjavadetection.diff?rev=36902&op=file
==============================================================================
--- packages/scilab/branches/5.3/debian/patches/xarmjavadetection.diff (added)
+++ packages/scilab/branches/5.3/debian/patches/xarmjavadetection.diff Tue Sep 28 19:42:50 2010
@@ -1,0 +1,24 @@
+--- ./m4/java.m4.orig	2010-04-20 09:59:27.000000000 +0000
++++ ./m4/java.m4	2010-09-11 20:27:40.476741575 +0000
+@@ -440,7 +440,7 @@
+ 	    powerpc|ppc64)
+ 	  	  machine=ppc
+ 		  ;;
+-		  armv4l|armv5tel)
++		  armv*)
+ 		  machine=arm
+ 		  ;;
+ 		  s390x) # s390 arch can also returns s390x
+Index: scilab-5.2.2/bin/scilab
+===================================================================
+--- scilab-5.2.2.orig/bin/scilab	2010-09-12 11:24:38.000000000 +0200
++++ scilab-5.2.2/bin/scilab	2010-09-12 11:25:01.000000000 +0200
+@@ -398,7 +398,7 @@
+ 					"s390"|"s390x")
+ 						proc="s390"
+ 						;;
+-					"armv4l"|"armv5tel")
++					armv*)
+ 						proc="arm"
+ 						;;
+ 					*)

Modified: packages/scilab/branches/5.3/debian/scilab-full-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/scilab-full-bin.install?rev=36902&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/scilab-full-bin.install (original)
+++ packages/scilab/branches/5.3/debian/scilab-full-bin.install Tue Sep 28 19:42:50 2010
@@ -7,7 +7,10 @@
 debian/tmp/usr/lib/scilab/libscilab.*
 debian/tmp/usr/lib/scilab/libscirenderer.*
 debian/tmp/usr/lib/scilab/libscixcos.*
-debian/tmp/usr/lib/scilab/libscixpad.*
+debian/tmp/usr/lib/scilab/libsciscinotes.*
 debian/tmp/usr/lib/scilab/libsciscicos_blocks.*
 debian/tmp/usr/lib/scilab/libsciscicos.*
 debian/tmp/usr/lib/scilab/libscihelptools.*
+debian/tmp/usr/lib/scilab/libsciaction_binding.*
+debian/tmp/usr/lib/scilab/libscihistory_browser.*
+debian/tmp/usr/lib/scilab/libsciui_data.*

Modified: packages/scilab/branches/5.3/debian/scilab-minimal-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/scilab-minimal-bin.install?rev=36902&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/scilab-minimal-bin.install (original)
+++ packages/scilab/branches/5.3/debian/scilab-minimal-bin.install Tue Sep 28 19:42:50 2010
@@ -1,7 +1,7 @@
 debian/tmp/usr/lib/scilab/libmat.*
 debian/tmp/usr/lib/scilab/libmex.*
 debian/tmp/usr/lib/scilab/libmx.*
-debian/tmp/usr/lib/scilab/libsciaction_binding.*
+debian/tmp/usr/lib/scilab/libsciaction_binding-disable.*
 debian/tmp/usr/lib/scilab/libsciapi_scilab.*
 debian/tmp/usr/lib/scilab/libsciarnoldi.*
 debian/tmp/usr/lib/scilab/libsciboolean.*
@@ -58,5 +58,10 @@
 debian/tmp/usr/lib/scilab/libsciumfpack.*
 debian/tmp/usr/lib/scilab/libsciwindows_tools.*
 debian/tmp/usr/lib/scilab/libscixcos-disable.*
-debian/tmp/usr/lib/scilab/libscixpad-disable.*
+debian/tmp/usr/lib/scilab/libsciscinotes-disable.*
+debian/tmp/usr/lib/scilab/libscihistory_browser-disable.*
+debian/tmp/usr/lib/scilab/libsciui_data-disable.*
+debian/tmp/usr/lib/scilab/libsciparameters.*
+debian/tmp/usr/lib/scilab/libsciparallel.*
+debian/tmp/usr/lib/scilab/libscicommons.*
 debian/tmp/usr/lib/pkgconfig/

More information about the debian-science-commits mailing list