r44702 - in /packages/scilab/branches/5.4/debian: control rules scilab-full-bin.install scilab-minimal-bin.install

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Fri Apr 13 11:27:57 2012
New Revision: 44702

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44702
Log:
With the graphic based on scirenderer

Modified:
    packages/scilab/branches/5.4/debian/control
    packages/scilab/branches/5.4/debian/rules
    packages/scilab/branches/5.4/debian/scilab-full-bin.install
    packages/scilab/branches/5.4/debian/scilab-minimal-bin.install

Modified: packages/scilab/branches/5.4/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/control?rev=44702&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/control (original)
+++ packages/scilab/branches/5.4/debian/control Fri Apr 13 11:27:57 2012
@@ -23,10 +23,11 @@
  libmatio-dev,
 # latex rendering
  libjlatexmath-java (>= 0.9.4),  libjlatexmath-fop-java (>= 0.9.4),
+ libscirenderer-java (>= 0.3.5),
 # Xcos
  libjgraphx-java (>= 1.8.0.0), libhdf5-dev (>= 1.8.8), libjhdf5-java (>= 2.8.0), imagemagick,
 # Unitary testing
- testng
+ ant-optional, junit4, libcobertura-java
 Standards-Version: 3.9.3
 Homepage: http://www.scilab.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
@@ -153,7 +154,7 @@
  fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
  javahelp2, libjgraphx-java (>= 1.8.0.0), libjhdf5-java (>= 2.6.0-1),
 # javahelp2, libjgraphx-java (>= 1.8.0.0), libjhdf5-java (>= 2.8.0-1),
- libskinlf-java, ${misc:Depends}
+ libskinlf-java, ${misc:Depends}, libscirenderer-java (>= 0.3.5)
 Recommends: pvm
 Replaces: scilab (<< 5.0), scilab-bin, scilab-minimal-bin (<< 5.3)
 Description: Scientific software package for numerical computations (all binary files)                                                                     

Modified: packages/scilab/branches/5.4/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/rules?rev=44702&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/rules (original)
+++ packages/scilab/branches/5.4/debian/rules Fri Apr 13 11:27:57 2012
@@ -15,8 +15,8 @@
 DEB_CONFIGURE_NORMAL_ARGS += --prefix=$(DEB_CONFIGURE_PREFIX) \
 	--with-pvm --with-fftw --enable-relocatable \
 	--with-umfpack --enable-build-localization \
-	--with-install-help-xml --enable-build-help
-#	--enable-compilation-tests
+	--with-install-help-xml --enable-build-help \
+	--enable-compilation-tests
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-as-needed"
 
@@ -42,7 +42,7 @@
 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
+DEB_MAKE_CHECK_TARGET = check
 
 DEB_INSTALL_CHANGELOGS_ALL = CHANGES_5.3.X CHANGES_5.4.X
 

Modified: packages/scilab/branches/5.4/debian/scilab-full-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/scilab-full-bin.install?rev=44702&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/scilab-full-bin.install (original)
+++ packages/scilab/branches/5.4/debian/scilab-full-bin.install Fri Apr 13 11:27:57 2012
@@ -1,5 +1,6 @@
 debian/tmp/usr/lib/scilab/libsciconsole.*
 debian/tmp/usr/lib/scilab/libscigraphic_export.*
+debian/tmp/usr/lib/scilab/libscigraphic_objects.*
 debian/tmp/usr/lib/scilab/libscigraphics.*
 debian/tmp/usr/lib/scilab/libscigui.*
 debian/tmp/usr/lib/scilab/libscijvm.*
@@ -14,5 +15,3 @@
 debian/tmp/usr/lib/scilab/libscihistory_browser.*
 debian/tmp/usr/lib/scilab/libsciui_data.*
 debian/tmp/usr/lib/scilab/libscixml.*
-debian/tmp/usr/lib/scilab/libscitypes.*
-

Modified: packages/scilab/branches/5.4/debian/scilab-minimal-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/scilab-minimal-bin.install?rev=44702&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/scilab-minimal-bin.install (original)
+++ packages/scilab/branches/5.4/debian/scilab-minimal-bin.install Fri Apr 13 11:27:57 2012
@@ -39,4 +39,6 @@
 debian/tmp/usr/lib/scilab/libscicommons-disable.*
 debian/tmp/usr/lib/scilab/libscidynamiclibrary.*
 debian/tmp/usr/lib/scilab/libscihdf5-forceload-disable.*
+debian/tmp/usr/lib/scilab/libscitypes.*
+debian/tmp/usr/lib/scilab/libscigraphic_objects-disable.*
 debian/tmp/usr/lib/pkgconfig/