On Sun, Jan 01, 2012 at 11:01:17PM +0900, Hideki Yamane wrote: > tags 642770 patch > thanks > > Hi, > > I've made a patch for fix FTBFS by adjusting JAVA_HOME path. > Please check it, thanks. I think the preferable way to fix these kind of bugs is by switching to B-D on default-jdk and point JAVA_HOME path to /usr/lib/jvm/default-java. I'm including a new patch. -- Miguel Landaeta, miguel at miguel.cc secure email with PGP 0x7D8967E9 available at http://keyserver.pgp.com/ "Faith means not wanting to know what is true." -- Nietzsche
diff -u libgdata-java-1.30.0/debian/changelog libgdata-java-1.30.0/debian/changelog --- libgdata-java-1.30.0/debian/changelog +++ libgdata-java-1.30.0/debian/changelog @@ -1,3 +1,11 @@ +libgdata-java (1.30.0-3) unstable; urgency=low + + * QA upload. + * Switch to default-jdk. (Closes: #642770). + * Switch to libservlet2.5-java. + + -- Miguel Landaeta <miguel@miguel.cc> Mon, 16 Jan 2012 19:40:32 -0430 + libgdata-java (1.30.0-2) unstable; urgency=low * QA upload. diff -u libgdata-java-1.30.0/debian/ant.properties libgdata-java-1.30.0/debian/ant.properties --- libgdata-java-1.30.0/debian/ant.properties +++ libgdata-java-1.30.0/debian/ant.properties @@ -3 +3 @@ -servlet.jar=/usr/share/java/servlet-api.jar +servlet.jar=/usr/share/java/servlet-api-2.5.jar diff -u libgdata-java-1.30.0/debian/control libgdata-java-1.30.0/debian/control --- libgdata-java-1.30.0/debian/control +++ libgdata-java-1.30.0/debian/control @@ -4,7 +4,7 @@ Maintainer: Debian QA Group <packages@qa.debian.org> Build-Depends: cdbs, debhelper (>= 5) Build-Depends-Indep: ant, glassfish-activation, glassfish-mail, - libservlet2.4-java, openjdk-6-jdk + libservlet2.5-java, default-jdk Standards-Version: 3.8.0 Homepage: http://code.google.com/apis/gdata/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgdata-java/ diff -u libgdata-java-1.30.0/debian/rules libgdata-java-1.30.0/debian/rules --- libgdata-java-1.30.0/debian/rules +++ libgdata-java-1.30.0/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/java-6-openjdk +JAVA_HOME := /usr/lib/jvm/default-java DEB_SRCDIR := java DEB_ANT_BUILDFILE := build-src.xml ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
Attachment:
signature.asc
Description: Digital signature