[jblas] 18/24: Imported Debian patch 1.2.0-3

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository jblas.

commit 336cfdb47082af1ea288bc9bc47cddfcf2962834
Author: Torsten Werner <twerner at debian.org>
Date:   Tue Oct 4 21:46:11 2011 +0200

    Imported Debian patch 1.2.0-3
---
 debian/changelog | 9 +++++++++
 debian/control   | 9 +++++----
 debian/rules     | 2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f019f0..48b3894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jblas (1.2.0-3) unstable; urgency=low
+
+  * Switch to default-jdk. (Closes: #643513)
+  * Improve Description.
+  * Remove Java runtime from Depends.
+  * Add Suggests: jblas-doc.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 04 Oct 2011 21:46:11 +0200
+
 jblas (1.2.0-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index f52caef..f115844 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Soeren Sonnenburg <sonne at debian.org>,
  Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk, ant-optional, gfortran,
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant-optional, gfortran,
  libatlas-base-dev, ruby
 Standards-Version: 3.9.1.0
 Section: science
@@ -13,8 +13,9 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jblas/
 
 Package: jblas
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre,
-Description: A fast linear algebra library for Java
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: jblas-doc
+Description: fast linear algebra library for Java
  jblas is a fast linear algebra library for Java. jblas is essentially
  a light-weight wrapper around BLAS and LAPACK routines, the
  de-facto industry standard for matrix computations. It uses
@@ -28,7 +29,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Recommends: jblas
 Section: doc
-Description: A fast linear algebra library for Java
+Description: fast linear algebra library for Java
  jblas is a fast linear algebra library for Java. jblas is essentially
  a light-weight wrapper around BLAS and LAPACK routines, the
  de-facto industry standard for matrix computations. It uses
diff --git a/debian/rules b/debian/rules
index 7a0ba86..00e2935 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_BUILD_TARGET := minimal-jar javadoc
 DEB_ANT_CLEAN_TARGET := clean clean-jars

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jblas.git