r37267 - in /packages/scilab/trunk/debian: ./ patches/

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Mon Feb 7 09:42:22 UTC 2011 

Author: sylvestre
Date: Mon Feb  7 09:42:17 2011
New Revision: 37267

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37267
Log:
merge from branch 5.3 +   * Upload in Debian unstable
  * A file moved from a package to the other caused a bug (LP: #710419)

Added:
    packages/scilab/trunk/debian/libscilab2-java.lintian-overrides
Removed:
    packages/scilab/trunk/debian/patches/CVE-2010-3378.diff
    packages/scilab/trunk/debian/patches/addchapter.diff
    packages/scilab/trunk/debian/patches/basename.diff
    packages/scilab/trunk/debian/patches/buildDocPT_BR.diff
    packages/scilab/trunk/debian/patches/ia64jvm.diff
    packages/scilab/trunk/debian/patches/increaseJavaHeap.diff
    packages/scilab/trunk/debian/patches/jhdf2.6.diff
    packages/scilab/trunk/debian/patches/sparcstartup.diff
    packages/scilab/trunk/debian/patches/writable-string.diff
    packages/scilab/trunk/debian/patches/xarmjavadetection.diff
Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/control
    packages/scilab/trunk/debian/libscilab-java.lintian-overrides
    packages/scilab/trunk/debian/orig-tar.sh
    packages/scilab/trunk/debian/patches/adddemo.diff
    packages/scilab/trunk/debian/patches/modelicac-not-available.diff
    packages/scilab/trunk/debian/rules
    packages/scilab/trunk/debian/scilab-full-bin.install
    packages/scilab/trunk/debian/scilab-minimal-bin.install
    packages/scilab/trunk/debian/scilab-test.lintian-overrides
    packages/scilab/trunk/debian/watch
    packages/scilab/trunk/debian/watcher.sh

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Mon Feb  7 09:42:17 2011
@@ -1,3 +1,57 @@
+scilab (5.3.0-final-2) unstable; urgency=low
+
+  * Upload in Debian unstable
+  * A file moved from a package to the other caused a bug (LP: #710419)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 06 Feb 2011 22:37:41 +0100
+
+scilab (5.3.0-final-1) experimental; urgency=low
+
+  * New upstream release
+  * URL in the watch file updated
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 16 Dec 2010 14:27:06 +0100
+
+scilab (5.3.0-beta-5-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 25 Nov 2010 01:26:20 +0100
+
+scilab (5.3.0-beta-4-3) experimental; urgency=low
+
+  * Fix some lintian warnings
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 05 Oct 2010 08:16:43 +0200
+
+scilab (5.3.0-beta-4-2) experimental; urgency=low
+
+  * Provide specific packages for javasci2 called libscilab2-java
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 04 Oct 2010 20:26:32 +0200
+
+scilab (5.3.0-beta-4-1) experimental; urgency=low
+
+  * New upstream release
+  patch addchapter.diff removed (applied upstream)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 28 Sep 2010 22:44:57 +0200
+
+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
+  * 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-9) unstable; urgency=low
 
   * Fix a problem in the ia64 startup. (Closes: #593684)

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Mon Feb  7 09:42:17 2011
@@ -10,7 +10,7 @@
 # numerical libraries
  libblas-dev | librefblas3-dev | libatlas-base-dev, liblapack-dev, 
 # Java deps
- libflexdock-java (>= 0.5.1), libjogl-java (>= 1.1.1), 
+ libflexdock-java (>= 0.5.1), libjogl-java (>= 1.1.1), libgl1-mesa-dev,
  libjrosetta-java (>= 1.0.1), ant,
 # Documentation 
  libjeuclid-core-java (>= 3.1.3), libbatik-java (>= 1.7), fop (>= 0.95), 
@@ -20,9 +20,9 @@
  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)
+ 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/
@@ -116,7 +116,7 @@
  javahelp2, libjgraphx-java (>= 1.2.0.8), libjhdf5-java (>= 2.6), 
  ${misc:Depends}
 Recommends: pvm
-Replaces: scilab (<< 5.0), scilab-bin
+Replaces: scilab (<< 5.0), scilab-bin, scilab-minimal-bin (<< 5.3)
 Description: Scientific software package for numerical computations (all binary files)                                                                     
  Scilab is a matrix-based scientific software package.
  Scilab contains hundreds of built-in mathematical functions, rich
@@ -182,12 +182,32 @@
  etc...) and comes with a number of specific toolboxes for 
  control, signal processing, ...
  .
+ This package provided the javasci interface.
+ .
  This package contains the Java library used to call Scilab's engine 
  from Java.
 
+
+
+Package: libscilab2-java
+Section: java
+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.
+ 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 provided the javasci (version 2) interface.
+ .
+ This package contains the Java library (version 2) used to call Scilab's engine
+ from Java.
+
 Package: scilab-doc
 Section: doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, scilab
 Architecture: all
 Description: Scientific software package (english documentations)
  Scilab is a matrix-based scientific software package.
@@ -227,7 +247,7 @@
 
 Package: scilab-test
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, scilab
 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 
@@ -239,3 +259,4 @@
  performance ...) for Scilab.
  .
  See Scilab function 'test_run' for usage.
+

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=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/libscilab-java.lintian-overrides (original)
+++ packages/scilab/trunk/debian/libscilab-java.lintian-overrides Mon Feb  7 09:42:17 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.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
 

Added: 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=37267&op=file
==============================================================================
--- packages/scilab/trunk/debian/libscilab2-java.lintian-overrides (added)
+++ packages/scilab/trunk/debian/libscilab2-java.lintian-overrides Mon Feb  7 09:42:17 2011
@@ -1,0 +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
+# shlibdeps disabled on libscilab-java 
+missing-dependency-on-libc needed by ./usr/lib/jni/libjavasci2.so.5.0.3
+

Modified: packages/scilab/trunk/debian/orig-tar.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/orig-tar.sh?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/orig-tar.sh (original)
+++ packages/scilab/trunk/debian/orig-tar.sh Mon Feb  7 09:42:17 2011
@@ -8,4 +8,3 @@
   mv $3 $origDir
   echo "moved $3 to $origDir"
 fi
-

Modified: packages/scilab/trunk/debian/patches/adddemo.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/adddemo.diff?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/adddemo.diff (original)
+++ packages/scilab/trunk/debian/patches/adddemo.diff Mon Feb  7 09:42:17 2011
@@ -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/trunk/debian/patches/modelicac-not-available.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/modelicac-not-available.diff?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/modelicac-not-available.diff (original)
+++ packages/scilab/trunk/debian/patches/modelicac-not-available.diff Mon Feb  7 09:42:17 2011
@@ -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
  

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Mon Feb  7 09:42:17 2011
@@ -20,6 +20,8 @@
 	--with-umfpack --enable-build-localization \
 	--with-install-help-xml --enable-build-help
 
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-as-needed"
+
 
 ENABLE_BUILD_HELP_ARCHS := amd64 i386
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(ENABLE_BUILD_HELP_ARCHS)))
@@ -38,7 +40,10 @@
 
 DEB_DH_MAKESHLIBS_ARGS_scilab-full-bin = -n
 DEB_DH_MAKESHLIBS_ARGS_scilab-minimal-bin = -n 
+DEB_DH_MAKESHLIBS_ARGS_libscilab-java = -n
+DEB_DH_MAKESHLIBS_ARGS_libscilab2-java = -n
 DEB_DH_SHLIBDEPS_ARGS_libscilab-java = -Xusr/lib/jni/libjavasci.so
+DEB_DH_SHLIBDEPS_ARGS_libscilab2-java = -Xusr/lib/jni/libjavasci2.so
 #DEB_MAKE_CHECK_TARGET = check
 
 debian/stamp-autotools-files:
@@ -117,7 +122,13 @@
 	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/
 	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/libscilab2-java::
+# Move the javasci2 lib
+	mkdir -p $(CURDIR)/debian/libscilab2-java/usr/share/java/
+	mkdir -p $(CURDIR)/debian/libscilab2-java/usr/lib/jni/
+	mv debian/tmp/usr/share/scilab/modules/javasci/jar/org.scilab.modules.javasci.jar $(CURDIR)/debian/libscilab2-java/usr/share/java/
+	mv debian/tmp/usr/lib/scilab/libjavasci2.so*  $(CURDIR)/debian/libscilab2-java/usr/lib/jni/
 
 
 binary-install/scilab-minimal-bin::

Modified: packages/scilab/trunk/debian/scilab-full-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-full-bin.install?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-full-bin.install (original)
+++ packages/scilab/trunk/debian/scilab-full-bin.install Mon Feb  7 09:42:17 2011
@@ -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/trunk/debian/scilab-minimal-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-minimal-bin.install?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-minimal-bin.install (original)
+++ packages/scilab/trunk/debian/scilab-minimal-bin.install Mon Feb  7 09:42:17 2011
@@ -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,11 @@
 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/scilab/libscicommons-disable.*
 debian/tmp/usr/lib/pkgconfig/

Modified: packages/scilab/trunk/debian/scilab-test.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-test.lintian-overrides?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-test.lintian-overrides (original)
+++ packages/scilab/trunk/debian/scilab-test.lintian-overrides Mon Feb  7 09:42:17 2011
@@ -1,3 +1,8 @@
 # It is for testing purposes only
 scilab-test: duplicate-font-file usr/share/scilab/modules/graphics/tests/unit_tests/DejaVuSansMono.ttf also in ttf-dejavu-core
 
+# Here on purpose
+scilab-test: windows-devel-file-in-package usr/share/scilab/modules/graph/tests/java/graph-JAVA-tests.vcproj
+scilab-test: windows-devel-file-in-package usr/share/scilab/modules/hdf5/tests/java/hdf5-JAVA-tests.vcproj
+scilab-test: windows-devel-file-in-package usr/share/scilab/modules/javasci/tests/java/javasci-JAVA-tests.vcproj
+scilab-test: windows-devel-file-in-package usr/share/scilab/modules/xcos/tests/java/xcos-JAVA-tests.vcproj

Modified: packages/scilab/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/watch?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/watch (original)
+++ packages/scilab/trunk/debian/watch Mon Feb  7 09:42:17 2011
@@ -1,5 +1,4 @@
 version=3
-opts="downloadurlmangle=s/.bin.linux-i686/-src/" \
-http://www.scilab.org/en/products/scilab/download \
-  .*/scilab-([\d\.]+).bin.linux-i686.tar.gz debian debian/orig-tar.sh
+http://www.scilab.org/en/communities/developer_zone/scilab_versions/stable \
+  .*/scilab-([\d\.]+)-src.tar.gz debian debian/orig-tar.sh
 

Modified: packages/scilab/trunk/debian/watcher.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/watcher.sh?rev=37267&op=diff
==============================================================================
--- packages/scilab/trunk/debian/watcher.sh (original)
+++ packages/scilab/trunk/debian/watcher.sh Mon Feb  7 09:42:17 2011
@@ -41,4 +41,4 @@
 
 echo "Watcher: Terminating."
 echo "Watcher: Removing lock"
-[ -f $DIR/watcher-lock ] && rm $DIR/watcher-lock
+[ -f $DIR/watcher-lock ] && rm $DIR/watcher-lock

More information about the debian-science-commits mailing list