From f7c9e22b9683b55d6c0874915ad07855f2389a03 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 3 Aug 2012 11:22:29 +0000 Subject: [PATCH] rules, overrides: Changed JAVA_HOME to /usr/lib/jvm/java-6-openjdk. Squeeze's OpenJDK does not use the -$ARCH prefix. --- debian/changelog | 2 ++ debian/collectd-core.overrides | 2 +- debian/rules | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b36d457..431e25f 100644 --- 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 Thu, 05 Jul 2012 13:39:28 +0200 diff --git a/debian/collectd-core.overrides b/debian/collectd-core.overrides index ec28843..f96f0c9 100644 --- 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 0e2d975..f502f2d 100755 --- 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 -- 2.30.2