r35236 - in /packages/scilab/trunk/debian: changelog patches/librarypath.diff patches/series rules

[sylvestre-guest at users.alioth.debian.org]

Author: sylvestre-guest
Date: Wed Oct  1 16:38:48 2008
New Revision: 35236

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35236
Log:
* openjdk
* install data
* build localization 
* install xml files for the help
* typo 
* update of the startup script (patch)

Added:
    packages/scilab/trunk/debian/patches/librarypath.diff
Modified:
    packages/scilab/trunk/debian/changelog
    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=35236&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Wed Oct  1 16:38:48 2008
@@ -1,9 +1,9 @@
 scilab (5.0.2-1) experimental; urgency=medium
 
   * New upstream version (Closes: #483682, #499565, #486876)
-  * Version moved to free.
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Fri, 16 Mar 2007 13:37:08 +0200
+  * Package moved to free.
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Fri, 1 Oct 2008 13:37:08 +0200
 
 scilab (4.1.2-6) unstable; urgency=low
 

Added: packages/scilab/trunk/debian/patches/librarypath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/librarypath.diff?rev=35236&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/librarypath.diff (added)
+++ packages/scilab/trunk/debian/patches/librarypath.diff Wed Oct  1 16:38:48 2008
@@ -1,0 +1,15 @@
+--- scilab-5.0.2.orig/bin/scilab	2008-10-01 16:56:54.000000000 +0200
++++ scilab-5.0.2/bin/scilab	2008-10-01 16:58:13.000000000 +0200
+@@ -436,11 +436,7 @@
+ #fi
+ #export PVM_ARCH
+ 
+-if test "$LD_LIBRARY_PATH" = ""; then
+-	LD_LIBRARY_PATH=$SCI/bin:$SCI/lib/scilab/
+-else
+-	LD_LIBRARY_PATH=$SCI/bin:$SCI/lib/scilab/:$LD_LIBRARY_PATH
+-fi
++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"
+ fi

Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=35236&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Wed Oct  1 16:38:48 2008
@@ -1,1 +1,15 @@
-
+--- scilab-5.0.2.orig/bin/scilab	2008-10-01 16:56:54.000000000 +0200
++++ scilab-5.0.2/bin/scilab	2008-10-01 16:58:13.000000000 +0200
+@@ -436,11 +436,7 @@
+ #fi
+ #export PVM_ARCH
+ 
+-if test "$LD_LIBRARY_PATH" = ""; then
+-	LD_LIBRARY_PATH=$SCI/bin:$SCI/lib/scilab/
+-else
+-	LD_LIBRARY_PATH=$SCI/bin:$SCI/lib/scilab/:$LD_LIBRARY_PATH
+-fi
++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"
+ fi

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=35236&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Wed Oct  1 16:38:48 2008
@@ -4,18 +4,27 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-6-sun/
-#LD_LIBRARY_PATH := /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/
-LD_LIBRARY_PATH = /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/:/usr/lib/libfakeroot/:/usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/server:/usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/native_threads/:$(DEB_DESTDIR)/usr/lib/scilab/
+
+# Detect the arch (with the namming of Sun)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+archdir_map	:= amd64=amd64 i386=i386 lpia=i386 powerpc=ppc sparc=sparc ia64=ia64
+archdir		:= $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
+			$(filter $(DEB_HOST_ARCH)=%, $(archdir_map))))
+
+JAVA_HOME            := /usr/lib/jvm/java-6-openjdk/
+
+LD_LIBRARY_PATH = $(JAVA_HOME)/jre/lib/$(archdir)/:/usr/lib/libfakeroot/:$(JAVA_HOME)/jre/lib/$(archdir)/server:$(JAVA_HOME)/jre/lib/$(archdir)/native_threads/:$(DEB_DESTDIR)/usr/lib/scilab/
 
 DEB_CONFIGURE_SCRIPT_ENV += PVM_ROOT=/usr/lib/pvm3/
 DEB_CONFIGURE_NORMAL_ARGS += --prefix=$(DEB_CONFIGURE_PREFIX) \
 	--with-pvm --with-fftw --enable-relocatable \
-	--with-umfpack --enable-build-localization
+	--with-umfpack --enable-build-localization --with-install-help-xml
 
-DEB_MAKE_BUILD_TARGET := all
+DEB_MAKE_BUILD_TARGET := all localization
 
-DEB_MAKE_INSTALL_TARGET := install install-html prefix=$(DEB_DESTDIR)/usr \
+DEB_MAKE_INSTALL_TARGET := install install-data install-html \
+					prefix=$(DEB_DESTDIR)/usr \
 				   bindir=$(DEB_DESTDIR)/usr/bin \
 				   datadir=$(DEB_DESTDIR)/usr/share/ \
 				   sharedir=$(DEB_DESTDIR)/usr/share/ \