The following commit has been merged in the master branch:
commit 07f7e3d56dad52bc2ee00abe546022ecda504ffb
Author: James Page <james.p...@canonical.com>
Date:   Tue Nov 29 09:21:59 2011 +0000

    Refreshed patches

diff --git a/debian/patches/add-osgi-manifest b/debian/patches/add-osgi-manifest
index e1a7b8d..929bc2e 100644
--- a/debian/patches/add-osgi-manifest
+++ b/debian/patches/add-osgi-manifest
@@ -5,9 +5,9 @@ Author: Mat Scales <m...@wibbly.org.uk> (debianization)
 Origin: https://issues.apache.org/jira/browse/LUCENE-3167
 Index: lucene3/common-build.xml
 ===================================================================
---- lucene3.orig/common-build.xml      2011-10-14 16:21:34.000000000 +0100
-+++ lucene3/common-build.xml   2011-10-14 16:23:38.902121613 +0100
-@@ -361,42 +361,17 @@
+--- lucene3.orig/common-build.xml      2011-11-29 09:21:38.245633846 +0000
++++ lucene3/common-build.xml   2011-11-29 09:21:38.521634620 +0000
+@@ -365,42 +365,17 @@
      <attribute name="implementation.title"/>
      <attribute name="spec.version"/>
      <sequential>
diff --git a/debian/patches/build-versionless-jars.patch 
b/debian/patches/build-versionless-jars.patch
index d08c987..905f2bd 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-10-14 17:34:18.000000000 +0100
-+++ lucene3/common-build.xml   2011-10-14 17:34:45.452484050 +0100
+--- 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
 @@ -50,7 +50,7 @@
    <property name="version" value="${dev.version}"/>
    <property name="spec.version" value="${version}"/>  
@@ -11,7 +11,7 @@ Index: lucene3/common-build.xml
  
    <property name="junit.jar" value="junit-4.7.jar"/>
    <property name="junit-location.jar" value="${common.dir}/lib/${junit.jar}"/>
-@@ -136,7 +136,7 @@
+@@ -138,7 +138,7 @@
    <property name="m2.repository.url" value="file://${maven.dist.dir}"/>
    <property name="m2.repository.private.key" 
value="${user.home}/.ssh/id_dsa"/>
  
@@ -20,7 +20,7 @@ Index: lucene3/common-build.xml
    <property name="jflex.home" location="${common.dir}"/>
  
    <path id="jflex.classpath">
-@@ -399,7 +399,7 @@
+@@ -403,7 +403,7 @@
      </sequential>
    </macrodef>
  
@@ -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-10-14 17:34:18.000000000 
+0100
-+++ lucene3/contrib/contrib-build.xml  2011-10-14 17:34:18.000000000 +0100
+--- 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
 @@ -118,7 +118,7 @@
      </sequential>
    </macrodef>
@@ -42,8 +42,8 @@ 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"/>
+@@ -140,7 +140,7 @@
+     <property name="facet.uptodate" value="true"/>
    </target>
  
 -  <property name="analyzers-smartcn.jar" 
value="${common.dir}/build/contrib/analyzers/smartcn/lucene-smartcn-${version}.jar"/>
@@ -51,7 +51,7 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-analyzers-smartcn-uptodate" 
unless="analyzers-smartcn.uptodate">
      <contrib-uptodate name="analyzers/smartcn" 
jarfile="${analyzers-smartcn.jar}" property="analyzers-smartcn.uptodate"/>
    </target>
-@@ -140,7 +140,7 @@
+@@ -151,7 +151,7 @@
      <property name="analyzers-smartcn.uptodate" value="true"/>
    </target>
  
@@ -60,7 +60,7 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-analyzers-stempel-uptodate" 
unless="analyzers-stempel.uptodate">
      <contrib-uptodate name="analyzers/stempel" 
jarfile="${analyzers-stempel.jar}" property="analyzers-stempel.uptodate"/>
    </target>
-@@ -151,7 +151,7 @@
+@@ -162,7 +162,7 @@
      <property name="analyzers-stempel.uptodate" value="true"/>
    </target>
  
@@ -69,7 +69,7 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-grouping-uptodate" unless="grouping.uptodate">
      <contrib-uptodate name="grouping" jarfile="${grouping.jar}" 
property="grouping.uptodate"/>
    </target>
-@@ -162,7 +162,7 @@
+@@ -173,7 +173,7 @@
      <property name="grouping.uptodate" value="true"/>
    </target>
  
@@ -78,7 +78,7 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-highlighter-uptodate" unless="highlighter.uptodate">
      <contrib-uptodate name="highlighter" jarfile="${highlighter.jar}" 
property="highlighter.uptodate"/>
    </target>
-@@ -173,7 +173,7 @@
+@@ -184,7 +184,7 @@
      <property name="highlighter.uptodate" value="true"/>
    </target>
  
@@ -87,7 +87,7 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-icu-uptodate" unless="icu.uptodate">
      <contrib-uptodate name="icu" jarfile="${icu.jar}" 
property="icu.uptodate"/>
    </target>
-@@ -184,7 +184,7 @@
+@@ -195,7 +195,7 @@
      <property name="icu.uptodate" value="true"/>
    </target>
  
@@ -96,7 +96,7 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-memory-uptodate" unless="memory.uptodate">
      <contrib-uptodate name="memory" jarfile="${memory.jar}" 
property="memory.uptodate"/>
    </target>
-@@ -195,7 +195,7 @@
+@@ -206,7 +206,7 @@
      <property name="memory.uptodate" value="true"/>
    </target>
  
@@ -105,7 +105,7 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-misc-uptodate" unless="misc.uptodate">
      <contrib-uptodate name="misc" jarfile="${misc.jar}" 
property="misc.uptodate"/>
    </target>
-@@ -206,7 +206,7 @@
+@@ -217,7 +217,7 @@
      <property name="misc.uptodate" value="true"/>
    </target>
  
@@ -114,7 +114,7 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-queries-uptodate" unless="queries.uptodate">
      <contrib-uptodate name="queries" jarfile="${queries.jar}" 
property="queries.uptodate"/>
    </target>
-@@ -217,7 +217,7 @@
+@@ -228,7 +228,7 @@
      <property name="queries.uptodate" value="true"/>
    </target>
  
@@ -123,7 +123,7 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-queryparser-uptodate" unless="queryparser.uptodate">
      <contrib-uptodate name="queryparser" jarfile="${queryparser.jar}" 
property="queryparser.uptodate"/>
    </target>
-@@ -228,7 +228,7 @@
+@@ -239,7 +239,7 @@
      <property name="queryparser.uptodate" value="true"/>
    </target>
  
@@ -132,7 +132,7 @@ Index: lucene3/contrib/contrib-build.xml
    <target name="check-spatial-uptodate" unless="spatial.uptodate">
      <contrib-uptodate name="spatial" jarfile="${spatial.jar}" 
property="spatial.uptodate"/>
    </target>
-@@ -239,7 +239,7 @@
+@@ -250,7 +250,7 @@
      <property name="spatial.uptodate" value="true"/>
    </target>
  
diff --git a/debian/patches/disable-tests b/debian/patches/disable-tests
index 9cc1e68..8de5bb1 100644
--- a/debian/patches/disable-tests
+++ b/debian/patches/disable-tests
@@ -4,8 +4,8 @@ Description: Disable the building and running of the test 
framework
 Author: Mat Scales <m...@wibbly.org.uk>
 Index: lucene3/build.xml
 ===================================================================
---- lucene3.orig/build.xml     2011-10-14 16:19:41.443617649 +0100
-+++ lucene3/build.xml  2011-10-14 16:19:47.543679903 +0100
+--- lucene3.orig/build.xml     2011-11-29 09:21:37.509631787 +0000
++++ lucene3/build.xml  2011-11-29 09:21:37.905632895 +0000
 @@ -182,7 +182,7 @@
  
    <target name="javadoc" depends="javadocs"/>
@@ -23,7 +23,7 @@ Index: lucene3/build.xml
    <li>Contrib packages:</li>
    <ul>
  ]]></echo>
-@@ -587,8 +586,7 @@
+@@ -589,8 +588,7 @@
      </delete>
    </target>
  
@@ -35,8 +35,8 @@ Index: lucene3/build.xml
  
 Index: lucene3/contrib/analyzers/build.xml
 ===================================================================
---- lucene3.orig/contrib/analyzers/build.xml   2011-10-14 15:58:55.295345399 
+0100
-+++ lucene3/contrib/analyzers/build.xml        2011-10-14 16:19:47.543679903 
+0100
+--- lucene3.orig/contrib/analyzers/build.xml   2011-11-29 09:21:25.833599112 
+0000
++++ lucene3/contrib/analyzers/build.xml        2011-11-29 09:21:37.905632895 
+0000
 @@ -63,7 +63,7 @@
      <ant dir="stempel" target="test" />
    </target>
@@ -48,8 +48,8 @@ Index: lucene3/contrib/analyzers/build.xml
      <ant dir="common" target="dist-maven" />
 Index: lucene3/contrib/contrib-build.xml
 ===================================================================
---- lucene3.orig/contrib/contrib-build.xml     2011-10-14 16:17:10.130109525 
+0100
-+++ lucene3/contrib/contrib-build.xml  2011-10-14 16:19:47.543679903 +0100
+--- lucene3.orig/contrib/contrib-build.xml     2011-11-29 09:21:25.793599000 
+0000
++++ lucene3/contrib/contrib-build.xml  2011-11-29 09:21:37.909632906 +0000
 @@ -60,7 +60,7 @@
    <target name="test" depends="init" if="contrib.has.tests">
      <antcall target="common.test" inheritRefs="true" />
@@ -61,8 +61,8 @@ Index: lucene3/contrib/contrib-build.xml
      type="file" 
 Index: lucene3/contrib/xml-query-parser/build.xml
 ===================================================================
---- lucene3.orig/contrib/xml-query-parser/build.xml    2011-10-14 
16:17:10.162109836 +0100
-+++ lucene3/contrib/xml-query-parser/build.xml 2011-10-14 16:19:47.543679903 
+0100
+--- lucene3.orig/contrib/xml-query-parser/build.xml    2011-11-29 
09:21:25.809599045 +0000
++++ lucene3/contrib/xml-query-parser/build.xml 2011-11-29 09:21:37.909632906 
+0000
 @@ -43,7 +43,7 @@
    <target name="compile-core" depends="jar-queries,common.compile-core" />
  
diff --git a/debian/patches/fix-lib-paths b/debian/patches/fix-lib-paths
index ea957ac..c603f42 100644
--- a/debian/patches/fix-lib-paths
+++ b/debian/patches/fix-lib-paths
@@ -5,11 +5,11 @@ Description: Change where the build looks for shared jar files
 Author: Mat Scales <m...@wibbly.org.uk>
 Index: lucene3/contrib/benchmark/build.xml
 ===================================================================
---- lucene3.orig/contrib/benchmark/build.xml   2011-10-14 17:32:23.348258310 
+0100
-+++ lucene3/contrib/benchmark/build.xml        2011-10-14 17:32:30.156270616 
+0100
-@@ -131,8 +131,13 @@
-       <pathelement path="${highlighter.jar}"/>
+--- lucene3.orig/contrib/benchmark/build.xml   2011-11-29 09:21:26.029599661 
+0000
++++ lucene3/contrib/benchmark/build.xml        2011-11-29 09:21:37.293631182 
+0000
+@@ -132,8 +132,13 @@
        <pathelement path="${analyzers-common.jar}"/>
+       <pathelement path="${facet.jar}"/>
        <path refid="base.classpath"/>
 -      <fileset dir="lib">
 -              <include name="**/*.jar"/>
@@ -23,7 +23,7 @@ Index: lucene3/contrib/benchmark/build.xml
        </fileset>
      </path>
      <path id="run.classpath">
-@@ -173,7 +178,7 @@
+@@ -174,7 +179,7 @@
        <path id="collation.runtime.classpath">
          <path refid="run.classpath"/>
      <pathelement path="${icu.jar}"/>
@@ -34,8 +34,8 @@ Index: lucene3/contrib/benchmark/build.xml
        <target name="collation" 
depends="compile,jar-icu,top-100k-wiki-word-files">
 Index: lucene3/contrib/icu/build.xml
 ===================================================================
---- lucene3.orig/contrib/icu/build.xml 2011-10-14 17:32:23.384258374 +0100
-+++ lucene3/contrib/icu/build.xml      2011-10-14 17:32:30.156270616 +0100
+--- lucene3.orig/contrib/icu/build.xml 2011-11-29 09:21:26.069599773 +0000
++++ lucene3/contrib/icu/build.xml      2011-11-29 09:21:37.293631182 +0000
 @@ -26,7 +26,7 @@
  
  
@@ -47,8 +47,8 @@ Index: lucene3/contrib/icu/build.xml
    <pathconvert property="project.classpath"
 Index: lucene3/contrib/queries/build.xml
 ===================================================================
---- lucene3.orig/contrib/queries/build.xml     2011-10-14 17:32:23.360258330 
+0100
-+++ lucene3/contrib/queries/build.xml  2011-10-14 17:32:30.160270622 +0100
+--- lucene3.orig/contrib/queries/build.xml     2011-11-29 09:21:26.049599717 
+0000
++++ lucene3/contrib/queries/build.xml  2011-11-29 09:21:37.509631787 +0000
 @@ -24,7 +24,7 @@
    </description>
  
@@ -60,8 +60,8 @@ Index: lucene3/contrib/queries/build.xml
    <pathconvert property="project.classpath"
 Index: lucene3/build.xml
 ===================================================================
---- lucene3.orig/build.xml     2011-10-14 17:32:23.320258259 +0100
-+++ lucene3/build.xml  2011-10-14 17:32:30.160270622 +0100
+--- lucene3.orig/build.xml     2011-11-29 09:21:25.993599560 +0000
++++ lucene3/build.xml  2011-11-29 09:21:37.509631787 +0000
 @@ -227,9 +227,15 @@
        <path id="javadoc.classpath">
          <path refid="classpath"/>
@@ -83,9 +83,9 @@ Index: lucene3/build.xml
  
 Index: lucene3/common-build.xml
 ===================================================================
---- lucene3.orig/common-build.xml      2011-10-14 17:32:23.336258287 +0100
-+++ lucene3/common-build.xml   2011-10-14 17:34:09.252497509 +0100
-@@ -136,7 +136,7 @@
+--- lucene3.orig/common-build.xml      2011-11-29 09:21:26.009599605 +0000
++++ lucene3/common-build.xml   2011-11-29 09:21:37.509631787 +0000
+@@ -138,7 +138,7 @@
    <property name="m2.repository.url" value="file://${maven.dist.dir}"/>
    <property name="m2.repository.private.key" 
value="${user.home}/.ssh/id_dsa"/>
  
@@ -94,7 +94,7 @@ Index: lucene3/common-build.xml
    <property name="jflex.home" location="${common.dir}"/>
  
    <path id="jflex.classpath">
-@@ -149,8 +149,8 @@
+@@ -151,8 +151,8 @@
    </path>
  
    <path id="javacc.classpath">
diff --git a/debian/patches/remove-svnversion-calls 
b/debian/patches/remove-svnversion-calls
index 209a1b0..9bd9b94 100644
--- a/debian/patches/remove-svnversion-calls
+++ b/debian/patches/remove-svnversion-calls
@@ -5,9 +5,9 @@ Description: Remove the calls to svnversion during the build 
process.
 Author: Mat Scales <m...@wibbly.org.uk>
 Index: lucene3/common-build.xml
 ===================================================================
---- lucene3.orig/common-build.xml      2011-10-14 16:17:10.000000000 +0100
-+++ lucene3/common-build.xml   2011-10-14 16:21:34.428788600 +0100
-@@ -171,15 +171,6 @@
+--- lucene3.orig/common-build.xml      2011-11-29 09:21:37.509631787 +0000
++++ lucene3/common-build.xml   2011-11-29 09:21:38.245633846 +0000
+@@ -173,15 +173,6 @@
  
    <property name="manifest.file" location="${common.dir}/build/MANIFEST.MF"/>
  
@@ -23,7 +23,7 @@ Index: lucene3/common-build.xml
    <property name="gpg.exe" value="gpg" />
    <property name="gpg.key" value="CODE SIGNING KEY" />
  
-@@ -400,7 +391,7 @@
+@@ -404,7 +395,7 @@
          <attribute name="Implementation-Title" 
value="@{implementation.title}"/>
          <!-- impl version can be any string -->
          <attribute name="Implementation-Version"
@@ -32,7 +32,7 @@ Index: lucene3/common-build.xml
          <attribute name="Implementation-Vendor"
                     value="The Apache Software Foundation"/>
          <attribute name="X-Compile-Source-JDK" value="${javac.source}"/>
-@@ -419,12 +410,6 @@
+@@ -423,12 +414,6 @@
      <attribute name="spec.version" default="${spec.version}"/>
      <element name="nested" optional="true" implicit="true"/>
      <sequential>

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

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to