[plplot] 29/68: Import Debian changes 5.8.0~RC1-3

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository plplot.

commit 3292a69eb29cdcacdb41f397041f75acfd722a0b
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Wed Nov 14 23:51:54 2007 +0100

    Import Debian changes 5.8.0~RC1-3
    
    plplot (5.8.0~RC1-3) unstable; urgency=low
    
      * debian/control: Build-depends on java-gcj-compat-dev and make the
        libplplot9-java package depend on java-gcj-compat.  It seems that the
        Java binding only work well with gcj/gij.  This should fix the
        autobuild failures related to the Java binding (closes: #451103)
      * debian/rules: Set the appropriate JAVA_HOME according to the above.
---
 debian/changelog | 10 ++++++++++
 debian/control   |  4 ++--
 debian/rules     |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f7e5c8..53f893b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+plplot (5.8.0~RC1-3) unstable; urgency=low
+
+  * debian/control: Build-depends on java-gcj-compat-dev and make the
+    libplplot9-java package depend on java-gcj-compat.  It seems that the
+    Java binding only work well with gcj/gij.  This should fix the
+    autobuild failures related to the Java binding (closes: #451103)
+  * debian/rules: Set the appropriate JAVA_HOME according to the above.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 14 Nov 2007 23:51:54 +0100
+
 plplot (5.8.0~RC1-2) unstable; urgency=low
 
   * Added Cairo driver and dropped psttf driver, making the former
diff --git a/debian/control b/debian/control
index fa5b33d..ba3d04f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38),
  python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
  python-numpy, ttf-freefont,
  docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x,
- opensp, jadetex, jikes-kaffe, kaffe-dev, fastjar, swig
+ opensp, jadetex, java-gcj-compat-dev, fastjar, swig
 Build-Conflicts: libplplot5,  octave2.1-headers
 XS-Python-Version: all
 Homepage: http://www.plplot.org
@@ -84,7 +84,7 @@ Description: Scientific plotting library
 Package: libplplot9-java
 Architecture: any
 Section: libs
-Depends: java-runtime, ${shlibs:Depends}
+Depends: java-gcj-compat, ${shlibs:Depends}
 Description: Scientific plotting library
  This packages contains the Java bindings for PLplot, a scientific
  plotting library.
diff --git a/debian/rules b/debian/rules
index d2430c2..05a5db5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ debdoc		:= $(debshr)/doc
 debinfo		:= $(debshr)/info
 debex		:= $(debshr)/plplot$(version)/examples
 
-JAVA_HOME = /usr/lib/kaffe
+JAVA_HOME = /usr/lib/jvm/java-gcj
 
 PYVERS = $(shell pyversions -vr)
 CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git