Package: setools
Version: 3.3.7-2
Severity: normal
Tags: patch

Hi,

setools currently depends on gcj-native-helper but does not produce
any X-gcj packages.  As far as I can tell, the reason why default-jdk
is not enough for you is because the build system "defaults" to
/usr/lib/jvm/java-gcj.
  If you want to use gcj, then you should Build-depend on (I think)
the gcj-jdk package.  However, I would recommend that you instead use
default-java by passing --with-java-prefix to configure.  Please
consider attached patch an example of how it may look.

I could not test the resulting build because of #672040.

~Niels
diff --git a/debian/changelog b/debian/changelog
index bd72b84..ae16c73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+setools (3.3.7-3.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Remove Build-Depends on gcj-native-helper.
+  * Compile the swig extensions with default-java.
+
+ -- Niels Thykier <ni...@thykier.net>  Tue, 19 Jun 2012 19:19:16 +0200
+
 setools (3.3.7-3) UNRELEASED; urgency=low
 
   * debian/patches/legacy.patch: Further split legacy patch
diff --git a/debian/control b/debian/control
index f3bc95a..7a13a1b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,6 @@ Build-Depends: autoconf (>= 2.59),
                default-jdk,
                dh-autoreconf,
                flex (>= 2.5.33-6),
-               gcj-native-helper,
                libbz2-dev,
                libcap-dev,
                libcunit1-dev,
diff --git a/debian/rules b/debian/rules
index ba6121c..b5272e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,12 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export JAVA_HOME := /usr/lib/jvm/default-java
 
 # Not all architectures have a java compiler
 HAVE_JAVAC:=$(shell if which javac >/dev/null 2>&1; then echo Yes; fi)
 ifneq (,$(strip $(HAVE_JAVAC)))
-JAVA_CONF_OPTION:=--enable-swig-java
+JAVA_CONF_OPTION:=--enable-swig-java --with-java-prefix=$(JAVA_HOME)
 else
 JAVA_CONF_OPTION:=
 endif

Reply via email to