This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository lucene2.
commit 126e08536573a0c71b380718c5f959ef2f21933b Author: Jan-Pascal van Best <[email protected]> Date: Wed Aug 8 14:26:08 2007 +0000 Build with gcj --- debian/TODO.Debian | 6 +++--- debian/ant.properties | 2 +- debian/changelog | 3 ++- debian/control | 6 +++--- debian/patches/00list | 1 + .../82_fix-javadoc-external-link-for-gcj.dpatch | 20 ++++++++++++++++++++ debian/rules | 4 ++-- 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/debian/TODO.Debian b/debian/TODO.Debian index a53ebc8..7440704 100644 --- a/debian/TODO.Debian +++ b/debian/TODO.Debian @@ -3,6 +3,6 @@ TODO 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. diff --git a/debian/ant.properties b/debian/ant.properties index c9a5f46..04a3e80 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -12,7 +12,7 @@ javacc.jar=/usr/share/java/javacc.jar 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 diff --git a/debian/changelog b/debian/changelog index 94f26bd..ad406b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/control b/debian/control index 1bbfa7c..8f7962e 100644 --- a/debian/control +++ b/debian/control @@ -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 @@ Uploaders: Jan-Pascal van Best <[email protected]>, Barry Hawkins <barry@all 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 @@ Standards-Version: 3.7.2 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), diff --git a/debian/patches/00list b/debian/patches/00list index 633e76c..bb8fc41 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -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 diff --git a/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch b/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch new file mode 100755 index 0000000..4853707 --- /dev/null +++ b/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch @@ -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 + +@DPATCH@ +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" /> diff --git a/debian/rules b/debian/rules index 3b404ad..6b97167 100755 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,8 @@ include /usr/share/cdbs/1/class/ant.mk 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
