Author: janpascal-guest Date: 2007-09-04 09:41:28 +0000 (Tue, 04 Sep 2007) New Revision: 4097
Added: branches/lucene2/ branches/lucene2/2.2.0/ Modified: branches/lucene2/2.2.0/debian/changelog branches/lucene2/2.2.0/debian/control branches/lucene2/2.2.0/debian/patches/50_fix-contrib-db-libs.dpatch branches/lucene2/2.2.0/debian/rules Log: Opened lucene2 2.2.0 branch for smaller fixes while trunk is transitioning to gcj Copied: branches/lucene2/2.2.0 (from rev 3973, tags/lucene2/2.2.0-1) Modified: branches/lucene2/2.2.0/debian/changelog =================================================================== --- tags/lucene2/2.2.0-1/debian/changelog 2007-08-01 20:59:03 UTC (rev 3973) +++ branches/lucene2/2.2.0/debian/changelog 2007-09-04 09:41:28 UTC (rev 4097) @@ -1,3 +1,9 @@ +lucene2 (2.2.0-2) unstable; urgency=low + + * Use libdb4.5-java instead of libdb4.3-java, which is removed from Debian. + + -- Jan-Pascal van Best <[EMAIL PROTECTED]> Tue, 04 Sep 2007 11:21:13 +0200 + lucene2 (2.2.0-1) unstable; urgency=low * New upstream release (2.2.0) Modified: branches/lucene2/2.2.0/debian/control =================================================================== --- tags/lucene2/2.2.0-1/debian/control 2007-08-01 20:59:03 UTC (rev 3973) +++ branches/lucene2/2.2.0/debian/control 2007-09-04 09:41:28 UTC (rev 4097) @@ -4,15 +4,15 @@ Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Jan-Pascal van Best <[EMAIL PROTECTED]>, Barry Hawkins <[EMAIL PROTECTED]>, Jeff Breidenbach <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]> -XS-Vcs-Browser: http://www.vanbest.org/websvn/lucene2 -XS-Vcs-svn: http://svn.vanbest.org/svn/lucene2 +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: debhelper (>= 4.0.0), dpatch (>= 2.0), sun-java5-jre, sun-java5-jdk, ant-optional, javacc, junit, libxalan2-java Build-Depends-Indep: libjtidy-java (>= 7), libjline-java (>= 0.9.5), libcommons-digester-java (>= 1.7), libregexp-java (>= 1.4), - libdb4.3-java (>= 4.3.29), + libdb4.5-java (>= 4.5.20), libcommons-collections3-java (>= 3.1), libcommons-logging-java (>= 1.0.4), libcommons-beanutils-java (>= 1.7.0) @@ -20,13 +20,12 @@ Package: liblucene2-java Architecture: all -Depends: ${misc:Depends}, - sun-java5-jre | sun-java6-jre, +Depends: sun-java5-jre | sun-java6-jre, libjtidy-java (>= 7), libjline-java (>= 0.9.5), libcommons-digester-java (>= 1.7), libregexp-java (>= 1.4), - libdb4.3-java (>= 4.3.29), + libdb4.5-java (>= 4.5.20), libcommons-collections3-java (>= 3.1), libcommons-logging-java (>= 1.0.4), libcommons-beanutils-java (>= 1.7.0) @@ -45,9 +44,7 @@ Package: liblucene2-java-doc Architecture: all Section: contrib/doc -Depends: ${misc:Depends}, - libregexp-java (>= 1.4), - ant-doc +Depends: libregexp-java (>= 1.4), ant-doc Description: Documentation for Lucene Lucene is a full-text search engine for the Java(TM) programming language. Lucene is not a complete application, but rather a code library and API Modified: branches/lucene2/2.2.0/debian/patches/50_fix-contrib-db-libs.dpatch =================================================================== --- tags/lucene2/2.2.0-1/debian/patches/50_fix-contrib-db-libs.dpatch 2007-08-01 20:59:03 UTC (rev 3973) +++ branches/lucene2/2.2.0/debian/patches/50_fix-contrib-db-libs.dpatch 2007-09-04 09:41:28 UTC (rev 4097) @@ -5,22 +5,25 @@ ## DP: No description. @DPATCH@ -diff -urNad trunk~/contrib/db/bdb/build.xml trunk/contrib/db/bdb/build.xml ---- trunk~/contrib/db/bdb/build.xml 2007-06-19 13:08:27.000000000 +0200 -+++ trunk/contrib/db/bdb/build.xml 2007-06-19 13:10:01.000000000 +0200 -@@ -8,7 +8,7 @@ - <property name="db.version" value="4.3.29" /> - +diff -urNad 2.2.0~/contrib/db/bdb/build.xml 2.2.0/contrib/db/bdb/build.xml +--- 2.2.0~/contrib/db/bdb/build.xml 2007-06-17 07:20:55.000000000 +0200 ++++ 2.2.0/contrib/db/bdb/build.xml 2007-09-04 11:28:03.000000000 +0200 +@@ -5,10 +5,8 @@ + Lucene Berkeley DB integration + </description> + +- <property name="db.version" value="4.3.29" /> +- <path id="db.jar"> - <pathelement location="lib/db-${db.version}.jar" /> -+ <pathelement location="/usr/share/java/libdb4.3-java.jar" /> ++ <pathelement location="/usr/share/java/libdb4.5-java.jar" /> </path> - + <available classname="com.sleepycat.db.internal.Db" property="db.jar.exists"> -@@ -23,12 +23,6 @@ - +@@ -23,12 +21,6 @@ + <import file="../../contrib-build.xml" /> - + - <target name="get-db-jar" unless="db.jar.exists"> - <mkdir dir="lib" /> - <get src="http://downloads.osafoundation.org/db/db-${db.version}.jar"; @@ -30,13 +33,12 @@ <target name="sanity-load-lib" depends="compile-test"> <java classname="org.apache.lucene.store.db.SanityLoadLibrary" classpathref="junit.classpath" -@@ -55,7 +49,6 @@ +@@ -55,7 +47,6 @@ <antcall target="common.test" inheritAll="true" inheritRefs="true" /> </target> - + - <target name="check-and-get-db-jar" depends="get-db-jar" /> - <target name="init" depends="contrib-build.init,check-and-get-db-jar" /> + <target name="init" depends="contrib-build.init" /> - + </project> - Modified: branches/lucene2/2.2.0/debian/rules =================================================================== --- tags/lucene2/2.2.0-1/debian/rules 2007-08-01 20:59:03 UTC (rev 3973) +++ branches/lucene2/2.2.0/debian/rules 2007-09-04 09:41:28 UTC (rev 4097) @@ -73,7 +73,7 @@ $(ANT) build-contrib $(ANT) war-demo # Skipping (very time consuming) until production time... - # $(ANT) test + $(ANT) test $(ANT) javadocs touch build-indep-stamp _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
