[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#424445: Proposed patch for #424445 (turkey FTBFS)



The attached patch sets JAVA_HOME and ant's build.compiler property,
as recomended by the java packaging team. This solves the FTBFS. The
resulting package works correctly with sun's java, but I have not been
able to make it run with gcj. I do not know if it's a problem with the
package or with my environment. Thus, I'm not tagging the bug as 'patch'
yet.

------------------------------------------------------------------------------
diff -r dc7e7243f5a5 debian/control
--- a/debian/control	Wed May 30 00:33:48 2007 -0500
+++ b/debian/control	Wed May 30 07:59:53 2007 -0500
@@ -2,7 +2,7 @@ Section: text
 Section: text
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 4.0.0), jikes, ant, bzip2, txt2man, imagemagick, java-gcj-compat-dev
+Build-Depends: debhelper (>= 4.0.0), ant, bzip2, txt2man, imagemagick, java-gcj-compat-dev
 Standards-Version: 3.6.2
 
 Package: turkey
diff -r dc7e7243f5a5 debian/rules
--- a/debian/rules	Wed May 30 00:33:48 2007 -0500
+++ b/debian/rules	Wed May 30 08:07:48 2007 -0500
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 
 DESTDIR=$(CURDIR)/debian/turkey
+export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj-4.1-1.5.0.0/jre
 
 build: build-stamp
 build-stamp:
 	dh_testdir
 
-	ant release
-	ant doc
+	ant -Dbuild.compiler=modern release
+	ant -Dbuild.compiler=modern doc
 	txt2man -s 1 -t turkey -B turkey turkey.1.txt2man > turkey.1
 	convert resources/icon.png -resize 32x32 turkey.xpm
 
@@ -19,6 +20,7 @@ clean:
 	rm -f build-stamp configure-stamp
 	rm -f turkey.1
 	rm -f turkey.png
+	rm -f turkey.xpm
 
 	ant clean
 
------------------------------------------------------------------------------

Attachment: signature.asc
Description: Digital signature


Reply to: