r45522 - in /packages/scilab-toolboxes/sciscipy/trunk/debian: changelog control patches/deprecatedHeader.diff patches/dropExtern.diff patches/includepath.diff patches/loadScilabJavaLibrary.diff patches/series rules

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Wed Jan 16 15:15:09 UTC 2013 

Author: sylvestre
Date: Wed Jan 16 15:15:08 2013
New Revision: 45522

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45522
Log:
* New upstream release
* sciscipy depends now fully on Scilab stack (Closes: #697244)
* Enable numpy features
* Also search Java in /usr//lib/jvm/default-java/

Removed:
    packages/scilab-toolboxes/sciscipy/trunk/debian/patches/deprecatedHeader.diff
    packages/scilab-toolboxes/sciscipy/trunk/debian/patches/dropExtern.diff
    packages/scilab-toolboxes/sciscipy/trunk/debian/patches/includepath.diff
Modified:
    packages/scilab-toolboxes/sciscipy/trunk/debian/changelog
    packages/scilab-toolboxes/sciscipy/trunk/debian/control
    packages/scilab-toolboxes/sciscipy/trunk/debian/patches/loadScilabJavaLibrary.diff
    packages/scilab-toolboxes/sciscipy/trunk/debian/patches/series
    packages/scilab-toolboxes/sciscipy/trunk/debian/rules

Modified: packages/scilab-toolboxes/sciscipy/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sciscipy/trunk/debian/changelog?rev=45522&op=diff
==============================================================================
--- packages/scilab-toolboxes/sciscipy/trunk/debian/changelog (original)
+++ packages/scilab-toolboxes/sciscipy/trunk/debian/changelog Wed Jan 16 15:15:08 2013
@@ -1,3 +1,12 @@
+sciscipy (1.0.0-1~exp1) experimental; urgency=low
+
+  * New upstream release
+  * sciscipy depends now fully on Scilab stack (Closes: #697244)
+  * Enable numpy features
+  * Also search Java in /usr//lib/jvm/default-java/
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 16 Jan 2013 13:56:14 +0100
+
 sciscipy (0.3.0-3) unstable; urgency=low
 
   * Fix FTBFS (provide the path to libscilab) (Closes: #652226)

Modified: packages/scilab-toolboxes/sciscipy/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sciscipy/trunk/debian/control?rev=45522&op=diff
==============================================================================
--- packages/scilab-toolboxes/sciscipy/trunk/debian/control (original)
+++ packages/scilab-toolboxes/sciscipy/trunk/debian/control Wed Jan 16 15:15:08 2013
@@ -5,16 +5,17 @@
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), python, python-support,
  python-all-dev (>= 2.6.6-3~),
- scilab-include (>= 5.3.0), scilab-full-bin, quilt
+ scilab-include (>= 5.3.0), scilab-full-bin, python-numpy
 Homepage: http://forge.scilab.org/index.php/p/sciscipy/
 X-Python-Version: all
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab-toolboxes/sciscipy/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scilab-toolboxes/sciscipy/trunk
 
 Package: python-sciscipy
 Architecture: any
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends},
+ scilab (>= 5.3.0)
 Description: Python binding of Scilab
  Sciscipy provides a Python API to map Scilab features.
  Three main methods are available:
@@ -22,7 +23,7 @@
   * sciscipy.read(sci_var_name)
   * sciscipy.write(sci_var_name, py_var_name)
  .
- Also, to increase the level of enjoyment, a python module 
- called scilab is also provided. This package contains a 
- class 'Scilab' that can be used to issue any valid scilab 
+ Also, to increase the level of enjoyment, a python module
+ called scilab is also provided. This package contains a
+ class 'Scilab' that can be used to issue any valid scilab
  function.

Modified: packages/scilab-toolboxes/sciscipy/trunk/debian/patches/loadScilabJavaLibrary.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sciscipy/trunk/debian/patches/loadScilabJavaLibrary.diff?rev=45522&op=diff
==============================================================================
--- packages/scilab-toolboxes/sciscipy/trunk/debian/patches/loadScilabJavaLibrary.diff (original)
+++ packages/scilab-toolboxes/sciscipy/trunk/debian/patches/loadScilabJavaLibrary.diff Wed Jan 16 15:15:08 2013
@@ -1,7 +1,7 @@
-Index: sciscipy-0.3.0/scilab.py
+Index: sciscipy-1.0.0/scilab.py
 ===================================================================
---- sciscipy-0.3.0.orig/scilab.py	2010-05-03 21:17:50.000000000 +0200
-+++ sciscipy-0.3.0/scilab.py	2010-05-03 21:18:00.000000000 +0200
+--- sciscipy-1.0.0.orig/scilab.py	2013-01-16 12:23:21.000000000 +0100
++++ sciscipy-1.0.0/scilab.py	2013-01-16 14:02:11.000000000 +0100
 @@ -47,6 +47,27 @@
  
  @author: vincent.guffens at gmail.com
@@ -20,7 +20,7 @@
 +				cdll.LoadLibrary(basePath+"/libjava.so")
 +				return True
 +
-+for jvm in ['/usr/lib/jvm/java-6-openjdk/','/usr/lib/jvm/java-6-sun/']:
++for jvm in ['/usr//lib/jvm/default-java/','/usr/lib/jvm/java-6-openjdk/','/usr/lib/jvm/java-6-sun/']:
 +	if detectJVM(jvm) == True:
 +		break
 +		
@@ -29,4 +29,4 @@
 +os.putenv("SCI","/usr/share/scilab")
  
  from sciscipy import write, read, eval
- 
+ from threading import Thread

Modified: packages/scilab-toolboxes/sciscipy/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sciscipy/trunk/debian/patches/series?rev=45522&op=diff
==============================================================================
--- packages/scilab-toolboxes/sciscipy/trunk/debian/patches/series (original)
+++ packages/scilab-toolboxes/sciscipy/trunk/debian/patches/series Wed Jan 16 15:15:08 2013
@@ -1,5 +1,2 @@
-deprecatedHeader.diff
-dropExtern.diff
-includepath.diff
 loadScilabJavaLibrary.diff
 

Modified: packages/scilab-toolboxes/sciscipy/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/sciscipy/trunk/debian/rules?rev=45522&op=diff
==============================================================================
--- packages/scilab-toolboxes/sciscipy/trunk/debian/rules (original)
+++ packages/scilab-toolboxes/sciscipy/trunk/debian/rules Wed Jan 16 15:15:08 2013
@@ -5,6 +5,7 @@
 	dh $@
 
 override_dh_shlibdeps:
+	dh_numpy
 	dh_shlibdeps -l/usr/lib/scilab
 
 .PHONY: override_dh_shlibdeps

More information about the debian-science-commits mailing list