r36919 - in /packages/scilab/trunk/debian: changelog patches/ia64jvm.diff patches/increaseJavaHeap.diff

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Tue Oct 5 21:09:53 UTC 2010


Author: sylvestre
Date: Tue Oct  5 21:09:47 2010
New Revision: 36919

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36919
Log:
  * Fix a problem in the ia64 startup. (Closes: #593684)
  * Build the help file by increasing the amount of memory available to the JVM
    (Closes: #599149)
  * Fails the build when some key components are not built

Added:
    packages/scilab/trunk/debian/patches/ia64jvm.diff
    packages/scilab/trunk/debian/patches/increaseJavaHeap.diff
Modified:
    packages/scilab/trunk/debian/changelog

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=36919&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Tue Oct  5 21:09:47 2010
@@ -1,9 +1,11 @@
 scilab (5.2.2-9) unstable; urgency=low
 
-  * Build the help file (Closes: #599149)
+  * Fix a problem in the ia64 startup. (Closes: #593684)
+  * Build the help file by increasing the amount of memory available to the JVM
+    (Closes: #599149)
   * Fails the build when some key components are not built
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 05 Oct 2010 10:31:47 +0200
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 05 Oct 2010 22:32:12 +0200
 
 scilab (5.2.2-8) unstable; urgency=high
 

Added: packages/scilab/trunk/debian/patches/ia64jvm.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/ia64jvm.diff?rev=36919&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/ia64jvm.diff (added)
+++ packages/scilab/trunk/debian/patches/ia64jvm.diff Tue Oct  5 21:09:47 2010
@@ -1,0 +1,13 @@
+Index: scilab-5.2.2/bin/scilab
+===================================================================
+--- scilab-5.2.2.orig/bin/scilab	2010-10-05 22:14:45.000000000 +0200
++++ scilab-5.2.2/bin/scilab	2010-10-05 22:14:54.000000000 +0200
+@@ -369,7 +369,7 @@
+ 						fi
+ 						;;
+ 					"ia64")
+-						proc="i64"
++						proc="ia64"
+ 						;;
+ 					"alpha")
+ 						proc="alpha"

Added: packages/scilab/trunk/debian/patches/increaseJavaHeap.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/increaseJavaHeap.diff?rev=36919&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/increaseJavaHeap.diff (added)
+++ packages/scilab/trunk/debian/patches/increaseJavaHeap.diff Tue Oct  5 21:09:47 2010
@@ -1,0 +1,22 @@
+Index: scilab-5.2.2/Makefile.am
+===================================================================
+--- scilab-5.2.2.orig/Makefile.am	2010-10-05 22:30:27.000000000 +0200
++++ scilab-5.2.2/Makefile.am	2010-10-05 22:32:26.000000000 +0200
+@@ -143,6 +143,8 @@
+ 
+ doc:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
+ if BUILD_HELP
++# Increases the size of the JVM to make sure we have enough memory available
++	sed -i -e "s|Xmx256m|Xmx512m|" $(top_builddir)/etc/jvm_options.xml
+ 	- at if test -x $(top_builddir)/scilab-bin; then \
+ 		cd $(top_builddir);\
+ 		echo "-- Building documentation (English) --"; \
+@@ -157,6 +159,8 @@
+ 	else \
+ 		echo "Cannot find Scilab-adv-cli binary"; \
+ 	fi
++# Revert the increasing of the memory
++	sed -i -e "s|Xmx512m|Xmx256m|" $(top_builddir)/etc/jvm_options.xml
+ else
+ 	@echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
+ endif




More information about the debian-science-commits mailing list