r36720 - in /packages/scilab/trunk/debian: changelog control libscilab-java.lintian-overrides patches/javalibpath.diff rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Tue Jul 6 18:19:38 UTC 2010
Author: sylvestre
Date: Tue Jul 6 18:19:36 2010
New Revision: 36720
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36720
Log:
* Missing files in libjavasci (Closes: #585679)
* libjavasci arch: all => any
* Rpath back in business for sciscipy (Closes: #586746)
* Set the exact dependencies on jgraphx (1.2.0.8). Too many compatibilities
issues.
Added:
packages/scilab/trunk/debian/libscilab-java.lintian-overrides
packages/scilab/trunk/debian/patches/javalibpath.diff
Modified:
packages/scilab/trunk/debian/changelog
packages/scilab/trunk/debian/control
packages/scilab/trunk/debian/rules
Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=36720&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Tue Jul 6 18:19:36 2010
@@ -1,3 +1,13 @@
+scilab (5.2.2-2) unstable; urgency=low
+
+ * Missing files in libjavasci (Closes: #585679)
+ * libjavasci arch: all => any
+ * Rpath back in business for sciscipy (Closes: #586746)
+ * Set the exact dependencies on jgraphx (1.2.0.8). Too many compatibilities
+ issues.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 27 Jun 2010 17:22:12 +0200
+
scilab (5.2.2-1) unstable; urgency=low
* New upstream release
Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=36720&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Tue Jul 6 18:19:36 2010
@@ -22,7 +22,7 @@
# latex rendering
libjlatexmath-java (>= 0.8),
# Xcos
- libjgraphx-java (>= 1.2.0.7), libhdf5-serial-dev, libjhdf5-java (>= 2.6)
+ libjgraphx-java (>= 1.2.0.8), libhdf5-serial-dev, libjhdf5-java (>= 2.6)
Standards-Version: 3.8.4
Homepage: http://www.scilab.org
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
@@ -112,7 +112,7 @@
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.7), libjhdf5-java (>= 2.6),
+ javahelp2, libjgraphx-java (>= 1.2.0.8), libjhdf5-java (>= 2.6),
${misc:Depends}
Recommends: pvm
Replaces: scilab (<< 5.0), scilab-bin
@@ -172,7 +172,7 @@
Package: libscilab-java
Section: java
-Architecture: all
+Architecture: any
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.
Added: packages/scilab/trunk/debian/libscilab-java.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/libscilab-java.lintian-overrides?rev=36720&op=file
==============================================================================
--- packages/scilab/trunk/debian/libscilab-java.lintian-overrides (added)
+++ packages/scilab/trunk/debian/libscilab-java.lintian-overrides Tue Jul 6 18:19:36 2010
@@ -1,0 +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
+# shlibdeps disabled on libscilab-java
+missing-dependency-on-libc needed by ./usr/lib/jni/libjavasci.so.5.0.2
+
Added: packages/scilab/trunk/debian/patches/javalibpath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/javalibpath.diff?rev=36720&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/javalibpath.diff (added)
+++ packages/scilab/trunk/debian/patches/javalibpath.diff Tue Jul 6 18:19:36 2010
@@ -1,0 +1,13 @@
+Index: scilab-5.2.2/modules/javasci/src/java/javasci/Scilab.java
+===================================================================
+--- scilab-5.2.2.orig/modules/javasci/src/java/javasci/Scilab.java 2010-06-13 23:26:23.000000000 +0200
++++ scilab-5.2.2/modules/javasci/src/java/javasci/Scilab.java 2010-06-13 23:26:59.000000000 +0200
+@@ -101,6 +101,8 @@
+ static
+ {
+ try {
++
++ System.setProperty("java.library.path", System.getProperty("java.library.path") + ":/usr/lib/jni/");
+ System.loadLibrary("javasci");
+ Scilab.Initialize();
+ } catch (SecurityException e) {
Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=36720&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Tue Jul 6 18:19:36 2010
@@ -38,7 +38,7 @@
DEB_DH_MAKESHLIBS_ARGS_scilab-full-bin = -n
DEB_DH_MAKESHLIBS_ARGS_scilab-minimal-bin = -n
-
+DEB_DH_SHLIBDEPS_ARGS_libscilab-java = -Xusr/lib/jni/libjavasci.so
#DEB_MAKE_CHECK_TARGET = check
debian/stamp-autotools-files:
@@ -67,12 +67,12 @@
moduleName=`echo $$dir|sed -e "s|.*/\(.*\)|\1|"`; \
target=$(CURDIR)/debian/scilab-doc/usr/share/scilab/modules/$$moduleName; \
target_test=$(CURDIR)/debian/scilab-test/usr/share/scilab/modules/$$moduleName; \
- :# Move tests in the right package; \
+ # Move tests in the right package; \
if test -d $$dir/tests; then \
mkdir -p $$target_test; \
mv $$dir/tests $$target_test; \
fi; \
- :# Move the help in the right package; \
+ # Move the help in the right package; \
if test -d $$dir/demos -o -d $$dir/help/en_US/; then \
mkdir -p $$target/help; \
fi; \
@@ -110,27 +110,29 @@
binary-install/libscilab-java::
# Move the javasci lib
mkdir -p $(CURDIR)/debian/libscilab-java/usr/share/java/
+ mkdir -p $(CURDIR)/debian/libscilab-java/usr/lib/jni/
mv debian/tmp/usr/share/scilab/modules/javasci/jar/javasci.jar $(CURDIR)/debian/libscilab-java/usr/share/java/
- rmdir debian/tmp/usr/share/scilab/modules/javasci/jar/
+ mv debian/tmp/usr/lib/scilab/libjavasci.so* $(CURDIR)/debian/libscilab-java/usr/lib/jni/
+ rm -rf debian/tmp/usr/share/scilab/modules/javasci/jar/
binary-install/scilab-minimal-bin::
- for file in $(DEB_DESTDIR)/usr/lib/scilab/*.so; do \
- chrpath -d $$file; \
- done
+# for file in $(DEB_DESTDIR)/usr/lib/scilab/*.so; do \
+# chrpath -d $$file; \
+# done
- for file in $(DEB_DESTDIR)/usr/bin/scilab-cli-bin; do \
- chrpath -d $$file; \
- done
+# for file in $(DEB_DESTDIR)/usr/bin/scilab-cli-bin; do \
+# chrpath -d $$file; \
+# done
mkdir -p $(CURDIR)/debian/scilab-minimal-bin/usr/bin
mv $(CURDIR)/debian/tmp/usr/bin/scilab-cli-bin $(CURDIR)/debian/scilab-minimal-bin/usr/bin/
-binary-install/scilab-full-bin::
+#binary-install/scilab-full-bin::
# Remove rpath
- for file in $(DEB_DESTDIR)/usr/bin/scilab-bin $(DEB_DESTDIR)/usr/bin/intersci; do \
- chrpath -d $$file; \
- done
+# for file in $(DEB_DESTDIR)/usr/bin/scilab-bin $(DEB_DESTDIR)/usr/bin/intersci; do \
+# chrpath -d $$file; \
+# done
# Move binaries
mkdir -p $(CURDIR)/debian/scilab-full-bin/usr/bin
More information about the debian-science-commits
mailing list