Author: janpascal-guest Date: 2007-08-08 14:26:08 +0000 (Wed, 08 Aug 2007) New Revision: 4003
Added: trunk/lucene2/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch Modified: trunk/lucene2/debian/TODO.Debian trunk/lucene2/debian/ant.properties trunk/lucene2/debian/changelog trunk/lucene2/debian/control trunk/lucene2/debian/patches/00list trunk/lucene2/debian/rules Log: Build with gcj Modified: trunk/lucene2/debian/TODO.Debian =================================================================== --- trunk/lucene2/debian/TODO.Debian 2007-08-08 11:38:32 UTC (rev 4002) +++ trunk/lucene2/debian/TODO.Debian 2007-08-08 14:26:08 UTC (rev 4003) @@ -3,6 +3,6 @@ Stuff to do regarding packaging of lucene-2.x.x: -- Split into -core and -contrib package (maybe even further split up -contrib). -- Try to use gcj instead of Sun java. Maybe just for -core. - +- Maybe split into -core and -contrib package (maybe even further split up + the -contrib package), because the package now has many dependencies because + of all the contribs. Modified: trunk/lucene2/debian/ant.properties =================================================================== --- trunk/lucene2/debian/ant.properties 2007-08-08 11:38:32 UTC (rev 4002) +++ trunk/lucene2/debian/ant.properties 2007-08-08 14:26:08 UTC (rev 4003) @@ -12,7 +12,7 @@ javac.debug=on javac.nowarn=off javac.verbose=yes -# build.rmic=kaffe +build.rmic=kaffe # build.compiler=javac1.5 compile.debug=on compile.optimize=on Modified: trunk/lucene2/debian/changelog =================================================================== --- trunk/lucene2/debian/changelog 2007-08-08 11:38:32 UTC (rev 4002) +++ trunk/lucene2/debian/changelog 2007-08-08 14:26:08 UTC (rev 4003) @@ -1,8 +1,9 @@ lucene2 (2.2.0-2~pre1) unstable; urgency=low * Moved to cdbs + * Build with gcj - -- Jan-Pascal van Best <[EMAIL PROTECTED]> Wed, 18 Jul 2007 08:25:20 +0200 + -- Jan-Pascal van Best <[EMAIL PROTECTED]> Wed, 08 Aug 2007 15:42:05 +0200 lucene2 (2.2.0-1) unstable; urgency=low Modified: trunk/lucene2/debian/control =================================================================== --- trunk/lucene2/debian/control 2007-08-08 11:38:32 UTC (rev 4002) +++ trunk/lucene2/debian/control 2007-08-08 14:26:08 UTC (rev 4003) @@ -1,5 +1,5 @@ Source: lucene2 -Section: contrib/text +Section: text Priority: optional Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Jan-Pascal van Best <[EMAIL PROTECTED]>, Barry Hawkins <[EMAIL PROTECTED]>, @@ -7,7 +7,7 @@ XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene2/ XS-Vcs-svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene2/ Build-Depends: cdbs, debhelper (>= 4.1.0), dpatch (>= 2.0), - sun-java5-jdk, + java-gcj-compat-dev, ant-optional, javacc, junit Build-Depends-Indep: libjtidy-java (>= 7), libjline-java (>= 0.9.5), @@ -21,7 +21,7 @@ Package: liblucene2-java Architecture: all -Depends: sun-java5-jre | sun-java6-jre, +Depends: java-gcj-compat | java2-runtime, libjtidy-java (>= 7), libjline-java (>= 0.9.5), libcommons-digester-java (>= 1.7), Modified: trunk/lucene2/debian/patches/00list =================================================================== --- trunk/lucene2/debian/patches/00list 2007-08-08 11:38:32 UTC (rev 4002) +++ trunk/lucene2/debian/patches/00list 2007-08-08 14:26:08 UTC (rev 4003) @@ -10,3 +10,4 @@ 70_fix-contrib-regex-libs.dpatch 80_fix-javadocs-classpath.dpatch 81_fix-javadocs-links.dpatch +82_fix-javadoc-external-link-for-gcj.dpatch Added: trunk/lucene2/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch =================================================================== --- trunk/lucene2/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch (rev 0) +++ trunk/lucene2/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch 2007-08-08 14:26:08 UTC (rev 4003) @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 82_fix-javadoc-external-link-for-gcj.dpatch by Jan-Pascal van Best <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: It seems the html doclet included with gcj cannot handle the http +## DP: redirect sent by the Sun web server + [EMAIL PROTECTED]@ +diff -urNad lucene2~/build.xml lucene2/build.xml +--- lucene2~/build.xml 2007-08-08 14:27:26.000000000 +0200 ++++ lucene2/build.xml 2007-08-08 14:27:46.000000000 +0200 +@@ -27,7 +27,7 @@ + + <property name="demo.name" value="lucene-demos-${version}"/> + <property name="demo.war.name" value="luceneweb"/> +- <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/> ++ <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/"/> + + <!-- Type of checksum to compute for distribution files --> + <property name="checksum.algorithm" value="md5" /> Property changes on: trunk/lucene2/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch ___________________________________________________________________ Name: svn:executable + * Modified: trunk/lucene2/debian/rules =================================================================== --- trunk/lucene2/debian/rules 2007-08-08 11:38:32 UTC (rev 4002) +++ trunk/lucene2/debian/rules 2007-08-08 14:26:08 UTC (rev 4003) @@ -10,8 +10,8 @@ DEB_INSTALL_CHANGELOGS_liblucene2-java := CHANGES.txt -# Build with java-1.5.0-sun -JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun +# Build with java-gcj +JAVA_HOME := /usr/lib/jvm/java-gcj DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo javadocs #DEB_ANT_CHECK_TARGET := test _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
