[Pkg-octave-commit] [SCM] Debian packaging for octave-java branch, master, updated. debian/1.2.8-3-2-g19a7fdc

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit ab3cad0f7fe356c1d8574fcb8eda9a11e42b8ab9
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Fri Jun 1 18:20:21 2012 +0200

    Depend on OpenJDK 7

diff --git a/debian/README.Debian b/debian/README.Debian
index 4f25cb2..1d51f65 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,9 +1,9 @@
 Octave Java for Debian
 ----------------------
 
-This package depends specifically on OpenJDK 6, and not on any JVM
+This package depends specifically on OpenJDK 7, and not on any other JVM
 implementation. The reason is that the code crashes when using the JVM
 implemented by GCJ. Upstream authors have confirmed that they never tried any
 JVM other than Sun's.
 
- -- Sébastien Villemot <sebastien.villemot at ens.fr>, Tue,  6 Sep 2011 21:32:07 +0200
+ -- Sébastien Villemot <sebastien.villemot at ens.fr>, Fri,  1 Jun 2012 18:18:36 +0200
diff --git a/debian/control b/debian/control
index d8d1a91..6172e89 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Sébastien Villemot <sebastien.villemot at ens.fr>,
            Thomas Weber <tweber at debian.org>
 Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.1),
- openjdk-6-jdk (>= 6b23~pre8-2)
+ openjdk-7-jdk
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
 Homepage: http://octave.sourceforge.net/java
@@ -15,7 +15,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-octave/octave-java.git
 Package: octave-java
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends},
- openjdk-6-jre-headless (>= 6b23~pre8-2)
+ openjdk-7-jre-headless
 Description: Java objects manipulation interface for Octave
  This package provides Java interface with OO-like Java objects manipulation to
  Octave, a numerical computational software. It has functions for creating Java
diff --git a/debian/rules b/debian/rules
index caf62ff..2aa1c76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-export JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH)
+export JAVA_HOME = /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH)
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
 

-- 
Debian packaging for octave-java