This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to annotated tag debian/2.2.0-2 in repository lucene2.
commit bf229da41e8fc5031a4ec3360d5191ccbaaff5e5 Author: Jan-Pascal van Best <[email protected]> Date: Tue Sep 4 09:41:28 2007 +0000 Opened lucene2 2.2.0 branch for smaller fixes while trunk is transitioning to gcj --- debian/changelog | 6 ++++++ debian/control | 15 ++++++------- debian/patches/50_fix-contrib-db-libs.dpatch | 32 +++++++++++++++------------- debian/rules | 2 +- 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac1d8eb..f716e52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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) diff --git a/debian/control b/debian/control index 1f70f7f..daa57ac 100644 --- a/debian/control +++ b/debian/control @@ -4,15 +4,15 @@ Priority: optional 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 @@ Standards-Version: 3.7.2 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 @@ Description: Full-text search engine library for Java(TM) 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 diff --git a/debian/patches/50_fix-contrib-db-libs.dpatch b/debian/patches/50_fix-contrib-db-libs.dpatch index cfbdac6..28045bb 100755 --- a/debian/patches/50_fix-contrib-db-libs.dpatch +++ b/debian/patches/50_fix-contrib-db-libs.dpatch @@ -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 @@ diff -urNad trunk~/contrib/db/bdb/build.xml trunk/contrib/db/bdb/build.xml <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> - diff --git a/debian/rules b/debian/rules index 6d718bf..08b1c52 100755 --- a/debian/rules +++ b/debian/rules @@ -73,7 +73,7 @@ build-indep-stamp: configure-stamp $(ANT) build-contrib $(ANT) war-demo # Skipping (very time consuming) until production time... - # $(ANT) test + $(ANT) test $(ANT) javadocs touch build-indep-stamp -- 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
