[SCM] Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging branch, master, updated. upstream/3.4.0-23-g5c4f3cc

[James Page]

The following commit has been merged in the master branch:
commit 5c4f3ccd15797d20c42c1efd97896fa175823f46
Author: James Page <james.page at canonical.com>
Date:   Fri Dec 23 09:55:03 2011 +0000

    Updates for 3.5.0

diff --git a/debian/liblucene3-contrib-java.jlibs b/debian/liblucene3-contrib-java.jlibs
index 8f4c081..35c894b 100644
--- a/debian/liblucene3-contrib-java.jlibs
+++ b/debian/liblucene3-contrib-java.jlibs
@@ -15,3 +15,4 @@ build/contrib/remote/lucene-remote.jar
 build/contrib/spatial/lucene-spatial.jar
 build/contrib/spellchecker/lucene-spellchecker.jar
 build/contrib/xml-query-parser/lucene-xml-query-parser.jar
+build/contrib/facet/lucene-facet.jar
diff --git a/debian/patches/build-versionless-jars.patch b/debian/patches/build-versionless-jars.patch
index 905f2bd..6e71a58 100644
--- a/debian/patches/build-versionless-jars.patch
+++ b/debian/patches/build-versionless-jars.patch
@@ -1,7 +1,7 @@
 Index: lucene3/common-build.xml
 ===================================================================
---- lucene3.orig/common-build.xml	2011-11-29 09:21:38.521634620 +0000
-+++ lucene3/common-build.xml	2011-11-29 09:21:38.817635447 +0000
+--- lucene3.orig/common-build.xml	2011-11-29 09:57:02.859567072 +0000
++++ lucene3/common-build.xml	2011-11-29 09:57:04.075570426 +0000
 @@ -50,7 +50,7 @@
    <property name="version" value="${dev.version}"/>
    <property name="spec.version" value="${version}"/>	
@@ -31,8 +31,8 @@ Index: lucene3/common-build.xml
       	<srcfiles dir="${common.dir}/src/java" includes="**/*.java"/>
 Index: lucene3/contrib/contrib-build.xml
 ===================================================================
---- lucene3.orig/contrib/contrib-build.xml	2011-11-29 09:21:37.909632906 +0000
-+++ lucene3/contrib/contrib-build.xml	2011-11-29 09:21:38.817635447 +0000
+--- lucene3.orig/contrib/contrib-build.xml	2011-11-29 09:56:59.515557848 +0000
++++ lucene3/contrib/contrib-build.xml	2011-11-29 09:57:21.823619368 +0000
 @@ -118,7 +118,7 @@
      </sequential>
    </macrodef>
@@ -42,6 +42,15 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-analyzers-common-uptodate" unless="analyzers-common.uptodate">
      <contrib-uptodate name="analyzers/common" jarfile="${analyzers-common.jar}" property="analyzers-common.uptodate"/>
    </target>
+@@ -129,7 +129,7 @@
+     <property name="analyzers-common.uptodate" value="true"/>
+   </target>
+ 
+-  <property name="facet.jar" value="${common.dir}/build/contrib/facet/lucene-facet-${version}.jar"/>
++  <property name="facet.jar" value="${common.dir}/build/contrib/facet/lucene-facet.jar"/>
+   <target name="check-facet-uptodate" unless="facet.uptodate">
+     <contrib-uptodate name="facet" jarfile="${facet.jar}" property="facet.uptodate"/>
+   </target>
 @@ -140,7 +140,7 @@
      <property name="facet.uptodate" value="true"/>
    </target>

-- 
Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging