rules, overrides: Changed JAVA_HOME to /usr/lib/jvm/java-6-openjdk.

Squeeze's OpenJDK does not use the -$ARCH prefix.

diff --git a/debian/changelog b/debian/changelog
index b36d457da5d834f1df81e1790109c7306f4715a9..431e25fb7ec94a67b43ea62de9a4161090c52d24 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ collectd (5.1.0-3~bpo60+1) squeeze-backports; urgency=low
   * debian/rules, debian/control:
     - Disabled modbus plugin, libmodbus-dev is not available on Squeeze.
     - Disabled AMQP plugin, librabbitmq-dev is not available on Squeeze.
+  * debian/rules, debian/collectd-core.overrides:
+    - Changed JAVA_HOME to /usr/lib/jvm/java-6-openjdk (without arch).
 
  -- Sebastian Harl <tokkee@debian.org>  Thu, 05 Jul 2012 13:39:28 +0200
 

diff --git a/debian/collectd-core.overrides b/debian/collectd-core.overrides
index ec28843e0f0552c27f32b32d6479c9860ae54318..f96f0c9762ab278d89e2c7f4fd5b0319bcbc69dc 100644 (file)
--- a/debian/collectd-core.overrides
+++ b/debian/collectd-core.overrides
@@ -10,5 +10,5 @@ collectd-core: capitalization-error-in-description python Python
 # The "java" plugin uses libjvm.so which can only be found in a non-standard
 # directory. According to the Java guys the path name and the ABI is stable
 # though ...
-collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/java-6-openjdk-*
+collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/java-6-openjdk/jre/lib/*
 

diff --git a/debian/rules b/debian/rules
index 0e2d9752debd20231ef7bbdd423192dc5aa2fdb8..f502f2d5f6f4642193af51b044e9f433a16ffc89 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ JAVA_ARCHDIR = $(shell /usr/share/javahelper/java-arch.sh $(DEB_BUILD_ARCH))
 ifeq (,$(JAVA_ARCHDIR))
        JAVA_ARCHDIR = $(DEB_BUILD_ARCH)
 endif
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
+JAVA_HOME = /usr/lib/jvm/java-6-openjdk
 JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
 
 JAVAC = $(JAVA_HOME)/bin/javac