rules: Use /usr/share/javahelper/java-arch.sh to determine the Java arch.

Thus, we make sure armhf and armel are supported as well; thanks to peter
green for reporting this and providing the pointer.

Closes: #656274

diff --git a/debian/changelog b/debian/changelog
index c36ac7d870351a14b4bce04f05899cbca6c9e020..338defae2ad58b76cdade7a8dcfacd53564381fe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ collectd (4.10.7-1) unstable; urgency=low
       providing the patch (Closes: #656271).
     - Don't force building of the ipvs plugin. The ip_vs.h check has been
       fixed in configure.
+    - Use /usr/share/javahelper/java-arch.sh to determine the Java
+      architecture directory, thus, making sure armhf and armel are supported
+      as well; thanks to peter green for reporting this and providing the
+      pointer (Closes: #656274).
   * debian/README.Debian:
     - Added section 'Cleanup of old data' explaining how to get rid of
       out-dated data files (e.g. RRD files).

diff --git a/debian/rules b/debian/rules
index 5f4eb6d612051f0ca43c4d5c49c7eb178c00fb64..2df30d93620a9997738175723e74fd917ced6d41 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,9 +31,7 @@ CPPFLAGS += -DCONFIGFILE='\"/etc/collectd/collectd.conf\"'
 LDFLAGS = `dpkg-buildflags --get LDFLAGS`
 
 # The archdir map has been copied from openjdk-6's debian/rules.
-JAVA_ARCHDIR_MAP = armel=arm hppa=parisc lpia=i386 powerpc=ppc powerpcspe=ppc sh4=sh
-JAVA_ARCHDIR = $(strip $(patsubst $(DEB_BUILD_ARCH)=%, %, \
-                       $(filter $(DEB_BUILD_ARCH)=%, $(JAVA_ARCHDIR_MAP))))
+JAVA_ARCHDIR = $(shell /usr/share/javahelper/java-arch.sh $(DEB_BUILD_ARCH))
 ifeq (,$(JAVA_ARCHDIR))
        JAVA_ARCHDIR = $(DEB_BUILD_ARCH)
 endif