r35969 - in /packages/scilab/trunk/debian: changelog control rules

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

Author: sylvestre-guest
Date: Sat Nov  7 15:34:09 2009
New Revision: 35969

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35969
Log:
* openjdk-6-jdk => default-jdk

Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/control
    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=35969&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Sat Nov  7 15:34:09 2009
@@ -1,3 +1,9 @@
+scilab (5.1.1-12) unstable; urgency=low
+
+  * openjdk-6-jdk => default-jdk
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 03 Nov 2009 23:51:04 +0100
+
 scilab (5.1.1-11) unstable; urgency=low
 
   * In the version 5.1.1-10, I changed a mv by a cp and it caused the help

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=35969&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Sat Nov  7 15:34:09 2009
@@ -4,7 +4,7 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>, Aurélien GÉRÔME <ag at debian.org>
 Build-Depends: autoconf, cdbs, debhelper (>= 7), cdbs, gfortran, 
- openjdk-6-jdk, chrpath, ocaml-nox,
+ default-jdk, chrpath, ocaml-nox,
  tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev, 
  gettext, libreadline-dev, pkg-config,
 # numerical libraries

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=35969&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Sat Nov  7 15:34:09 2009
@@ -13,7 +13,7 @@
 archdir		:= $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
 			$(filter $(DEB_HOST_ARCH)=%, $(archdir_map))))
 
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk/
+JAVA_HOME            := /usr/lib/jvm/default-java
 
 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/