r38153 - in /packages/scilab/trunk/debian: changelog control libscilab-java.lintian-overrides libscilab2-java.lintian-overrides patches/librarypath.diff patches/mips64.diff patches/s390javadetection.diff patches/series rules

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Thu Mar 3 16:37:17 UTC 2011 

Author: sylvestre
Date: Thu Mar  3 16:37:15 2011
New Revision: 38153

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38153
Log:
+  * New upstream release
+  * Japanese documentation added (package scilab-doc-ja)

Removed:
    packages/scilab/trunk/debian/patches/s390javadetection.diff
Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/control
    packages/scilab/trunk/debian/libscilab-java.lintian-overrides
    packages/scilab/trunk/debian/libscilab2-java.lintian-overrides
    packages/scilab/trunk/debian/patches/librarypath.diff
    packages/scilab/trunk/debian/patches/mips64.diff
    packages/scilab/trunk/debian/patches/series
    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=38153&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Thu Mar  3 16:37:15 2011
@@ -1,10 +1,12 @@
-scilab (5.3.0-final-4) UNRELEASED; urgency=low
-
+scilab (5.3.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Japanese documentation added (package scilab-doc-ja)
   * Switch to dpkg-source 3.0 (quilt) format
   * Aurélien removed from uploader (MIA)
   * Updated description with Xcos
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 16 Feb 2011 22:53:27 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 01 Mar 2011 15:37:03 +0100
 
 scilab (5.3.0-final-3) unstable; urgency=low
 

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=38153&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Thu Mar  3 16:37:15 2011
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), cdbs, gfortran, 
- default-jdk, chrpath, ocaml-nox,
+Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), gfortran, 
+ default-jdk, chrpath, ocaml-nox, quilt,
  tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev, 
  gettext, libreadline-dev, pkg-config, procps,
 # numerical libraries
@@ -20,9 +20,9 @@
  pvm-dev, fftw3-dev | libfftw3-dev, libsuitesparse-dev (>= 3.4.0), 
  libmatio-dev,
 # latex rendering
- libjlatexmath-java (>= 0.9.3),  libjlatexmath-fop-java (>= 0.9.3),
+ libjlatexmath-java (>= 0.9.4),  libjlatexmath-fop-java (>= 0.9.4),
 # Xcos
- libjgraphx-java (>= 1.4.0.2), libhdf5-serial-dev, libjhdf5-java (>= 2.6)
+ libjgraphx-java (>= 1.4.1.0), 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/
@@ -55,6 +55,7 @@
 Recommends: scilab-doc (= ${binary:Version}), 
 Suggests: scilab-doc-fr (= ${binary:Version}), 
  scilab-doc-pt-br (= ${binary:Version}),
+ scilab-doc-ja (= ${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
@@ -332,6 +333,27 @@
  .
  This package contains help pages in Brazilian Portuguese documentation.
 
+Package: scilab-doc-ja
+Section: doc
+Architecture: all
+Depends: scilab-doc, ${misc:Depends}
+Description: Scientific software package (Japanese documentation)
+ Scilab is a matrix-based scientific software package.
+ Scilab contains hundreds of built-in mathematical functions, rich 
+ data structures (including polynomials, rationals,linear systems, lists, 
+ etc...) and comes with a number of specific toolboxes for 
+ control, signal processing, ...
+ .
+ This package also provides Xcos, a graphical editor to design hybrid
+ dynamical systems models. Models can be designed, loaded, saved, compiled and
+ simulated.
+ Stable and efficient solution for industrial and academics needs, Xcos
+ provides functionalities for modeling of mechanical systems (automotive,
+ aeronautics...), hydraulic circuits (dam, pipe modeling...), control systems,
+ etc. Modelica capabilities are also provided.
+ .
+ This package contains help pages in Japanese documentation.
+
 
 Package: scilab-test
 Architecture: all

Modified: 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=38153&op=diff
==============================================================================
--- packages/scilab/trunk/debian/libscilab-java.lintian-overrides (original)
+++ packages/scilab/trunk/debian/libscilab-java.lintian-overrides Thu Mar  3 16:37:15 2011
@@ -1,5 +1,5 @@
 # rpath is used to point to Scilab libraries
-binary-or-shlib-defines-rpath ./usr/lib/jni/libjavasci.so.5.0.3 /usr/lib/scilab
+binary-or-shlib-defines-rpath ./usr/lib/jni/libjavasci.so.5.3.1 /usr/lib/scilab
 # shlibdeps disabled on libscilab-java 
-missing-dependency-on-libc needed by ./usr/lib/jni/libjavasci.so.5.0.3
+missing-dependency-on-libc needed by ./usr/lib/jni/libjavasci.so.5.3.1
 

Modified: packages/scilab/trunk/debian/libscilab2-java.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/libscilab2-java.lintian-overrides?rev=38153&op=diff
==============================================================================
--- packages/scilab/trunk/debian/libscilab2-java.lintian-overrides (original)
+++ packages/scilab/trunk/debian/libscilab2-java.lintian-overrides Thu Mar  3 16:37:15 2011
@@ -1,5 +1,5 @@
 # rpath is used to point to Scilab libraries
-binary-or-shlib-defines-rpath ./usr/lib/jni/libjavasci2.so.5.0.3 /usr/lib/scilab
+binary-or-shlib-defines-rpath ./usr/lib/jni/libjavasci2.so.5.3.1 /usr/lib/scilab
 # shlibdeps disabled on libscilab-java 
-missing-dependency-on-libc needed by ./usr/lib/jni/libjavasci2.so.5.0.3
+missing-dependency-on-libc needed by ./usr/lib/jni/libjavasci2.so.5.3.1
 

Modified: packages/scilab/trunk/debian/patches/librarypath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/librarypath.diff?rev=38153&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/librarypath.diff (original)
+++ packages/scilab/trunk/debian/patches/librarypath.diff Thu Mar  3 16:37:15 2011
@@ -1,6 +1,7 @@
---- bin/scilab.orig	2009-02-13 10:12:45.000000000 +0100
-+++ bin/scilab	2009-02-13 10:14:06.000000000 +0100
-@@ -439,7 +439,7 @@
+diff -ur scilab-5.3.1.orig/bin/scilab scilab-5.3.1/bin//scilab
+--- scilab-5.3.1.orig/bin/scilab	2011-03-01 16:11:07.000000000 +0100
++++ scilab-5.3.1/bin//scilab	2011-03-01 16:12:06.000000000 +0100
+@@ -601,7 +601,7 @@
  #export PVM_ARCH
  
  SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
@@ -9,17 +10,18 @@
  
  case $OS in
      *darwin* | *Darwin*) # MacOS X
-@@ -453,6 +453,7 @@
+@@ -625,6 +625,7 @@
      *)
  esac
  
 +LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
  
  if test $SCIVERBOSE -ne 0; then
- 	echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
---- bin/scilab-cli.orig	2009-02-13 10:12:45.000000000 +0100
-+++ bin/scilab-cli	2009-02-13 10:14:06.000000000 +0100
-@@ -439,7 +439,7 @@
+     echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
+diff -ur scilab-5.3.1.orig/bin/scilab-adv-cli scilab-5.3.1/bin//scilab-adv-cli
+--- scilab-5.3.1.orig/bin/scilab-adv-cli	2011-03-01 16:11:07.000000000 +0100
++++ scilab-5.3.1/bin//scilab-adv-cli	2011-03-01 16:12:06.000000000 +0100
+@@ -601,7 +601,7 @@
  #export PVM_ARCH
  
  SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
@@ -28,17 +30,19 @@
  
  case $OS in
      *darwin* | *Darwin*) # MacOS X
-@@ -453,6 +453,7 @@
+@@ -625,6 +625,7 @@
      *)
  esac
  
 +LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
  
  if test $SCIVERBOSE -ne 0; then
- 	echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
---- bin/scilab-adv-cli.orig	2009-02-13 10:12:45.000000000 +0100
-+++ bin/scilab-adv-cli	2009-02-13 10:14:06.000000000 +0100
-@@ -439,7 +439,7 @@
+     echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
+Seulement dans scilab-5.3.1/bin/: scilab-adv-cli.orig
+diff -ur scilab-5.3.1.orig/bin/scilab-cli scilab-5.3.1/bin//scilab-cli
+--- scilab-5.3.1.orig/bin/scilab-cli	2011-03-01 16:11:07.000000000 +0100
++++ scilab-5.3.1/bin//scilab-cli	2011-03-01 16:12:06.000000000 +0100
+@@ -601,7 +601,7 @@
  #export PVM_ARCH
  
  SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
@@ -47,11 +51,11 @@
  
  case $OS in
      *darwin* | *Darwin*) # MacOS X
-@@ -453,6 +453,7 @@
+@@ -625,6 +625,7 @@
      *)
  esac
  
 +LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
  
  if test $SCIVERBOSE -ne 0; then
- 	echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
+     echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"

Modified: packages/scilab/trunk/debian/patches/mips64.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/mips64.diff?rev=38153&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/mips64.diff (original)
+++ packages/scilab/trunk/debian/patches/mips64.diff Thu Mar  3 16:37:15 2011
@@ -1,13 +1,12 @@
-Index: scilab-5.2.2/bin/scilab
-===================================================================
---- scilab-5.2.2.orig/bin/scilab	2010-09-23 14:03:16.000000000 +0200
-+++ scilab-5.2.2/bin/scilab	2010-09-23 14:03:49.000000000 +0200
-@@ -383,7 +383,7 @@
- 					"ia64")
- 						proc="ia64"
- 						;;
--					"mips"|"mipsel") # under mipsel, uname -m is
-+					mips*) # under mipsel, uname -m is
- 					# usually returning mips ...
- 					# but binary are in mipsel
- 						if test -d ${JRE_HOME}/lib/mipsel ; then
+diff -ur scilab-5.3.1.orig/bin/scilab scilab-5.3.1/bin//scilab
+--- scilab-5.3.1.orig/bin/scilab	2011-03-01 16:11:07.000000000 +0100
++++ scilab-5.3.1/bin//scilab	2011-03-01 16:18:39.000000000 +0100
+@@ -446,7 +446,7 @@
+                         "ia64")
+                             proc="ia64"
+                             ;;
+-                        "mips"|"mipsel") # under mipsel, uname -m is
++                        mips*) # under mipsel, uname -m is
+                     # usually returning mips ...
+                     # but binary are in mipsel
+                             if test -d ${JRE_HOME}/lib/mipsel ; then

Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=38153&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Thu Mar  3 16:37:15 2011
@@ -4,4 +4,4 @@
 mips64.diff
 missingaddchapter.diff
 modelicac-not-available.diff
-s390javadetection.diff
+

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=38153&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Thu Mar  3 16:37:15 2011
@@ -99,6 +99,10 @@
 			mkdir -p $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/$$moduleName/help; \
 			mv $$dir/help/pt_BR $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/$$moduleName/help/; \
 		fi; \
+		if test -d $$dir/help/ja_JP; then \
+			mkdir -p $(CURDIR)/debian/scilab-doc-ja/usr/share/scilab/modules/$$moduleName/help; \
+			mv $$dir/help/ja_JP $(CURDIR)/debian/scilab-doc-ja/usr/share/scilab/modules/$$moduleName/help/; \
+		fi; \
 	done
 
 install/scilab-doc::
@@ -115,6 +119,11 @@
 	mkdir $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/helptools/jar/
 	PT_BR_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_pt_BR_help.jar; \
 	mv $$PT_BR_DOC $(CURDIR)/debian/scilab-doc-pt-br/usr/share/scilab/modules/helptools/jar/
+
+install/scilab-doc-ja::
+	mkdir -p $(CURDIR)/debian/scilab-doc-ja/usr/share/scilab/modules/helptools/jar/
+	JA_DOC=$(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_ja_JP_help.jar; \
+	mv $$JA_DOC $(CURDIR)/debian/scilab-doc-ja/usr/share/scilab/modules/helptools/jar/
 
 binary-install/libscilab-java::
 # Move the javasci lib

More information about the debian-science-commits mailing list