The following commit has been merged in the master branch:
commit 7d8736ee4fb822aeb520c6ae18e590a468d53fd4
Author: James Page <james.p...@ubuntu.com>
Date: Mon May 28 09:40:09 2012 +0100
Tidied patches directory
diff --git a/debian/patches/build-versionless-jars.patch
b/debian/patches/build-versionless-jars.patch
deleted file mode 100644
index 5b8109e..0000000
--- a/debian/patches/build-versionless-jars.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Index: lucene-solr/lucene/common-build.xml
-===================================================================
---- lucene-solr.orig/lucene/common-build.xml 2012-05-23 09:57:25.949412711
+0100
-+++ lucene-solr/lucene/common-build.xml 2012-05-23 09:59:31.017823100
+0100
-@@ -51,7 +51,7 @@
- <property name="version" value="${dev.version}"/>
- <property name="spec.version" value="${version}"/>
- <property name="year" value="2000-${current.year}"/>
-- <property name="final.name" value="lucene-${name}-${version}"/>
-+ <property name="final.name" value="lucene-${name}"/>
-
- <property name="common.classpath.excludes"
value="**/*.txt,**/*.template,**/*.sha1" />
-
-@@ -510,7 +510,7 @@
- </sequential>
- </macrodef>
-
-- <property name="lucene-core.jar"
value="${common.dir}/build/core/lucene-core-${version}.jar"/>
-+ <property name="lucene-core.jar"
value="${common.dir}/build/core/lucene-core.jar"/>
- <target name="check-lucene-core-uptodate" unless="lucene-core.uptodate">
- <uptodate property="lucene-core.uptodate" targetfile="${lucene-core.jar}">
- <srcfiles dir="${common.dir}/core/src/java" includes="**/*.java"/>
-Index: lucene-solr/lucene/contrib/contrib-build.xml
-===================================================================
---- lucene-solr.orig/lucene/contrib/contrib-build.xml 2012-05-23
09:57:25.969412777 +0100
-+++ lucene-solr/lucene/contrib/contrib-build.xml 2012-05-23
09:58:24.697607362 +0100
-@@ -96,7 +96,7 @@
- </sequential>
- </macrodef>
-
-- <property name="analyzers-common.jar"
value="${common.dir}/build/contrib/analyzers/common/lucene-analyzers-${version}.jar"/>
-+ <property name="analyzers-common.jar"
value="${common.dir}/build/contrib/analyzers/common/lucene-analyzers.jar"/>
- <target name="check-analyzers-common-uptodate"
unless="analyzers-common.uptodate">
- <contrib-uptodate name="analyzers/common"
jarfile="${analyzers-common.jar}" property="analyzers-common.uptodate"/>
- </target>
-@@ -118,7 +118,7 @@
- <property name="analyzers-phonetic.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>
-@@ -129,7 +129,7 @@
- <property name="facet.uptodate" value="true"/>
- </target>
-
-- <property name="analyzers-smartcn.jar"
value="${common.dir}/build/contrib/analyzers/smartcn/lucene-smartcn-${version}.jar"/>
-+ <property name="analyzers-smartcn.jar"
value="${common.dir}/build/contrib/analyzers/smartcn/lucene-smartcn.jar"/>
- <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 @@
- <property name="analyzers-smartcn.uptodate" value="true"/>
- </target>
-
-- <property name="analyzers-stempel.jar"
value="${common.dir}/build/contrib/analyzers/stempel/lucene-stempel-${version}.jar"/>
-+ <property name="analyzers-stempel.jar"
value="${common.dir}/build/contrib/analyzers/stempel/lucene-stempel.jar"/>
- <target name="check-analyzers-stempel-uptodate"
unless="analyzers-stempel.uptodate">
- <contrib-uptodate name="analyzers/stempel"
jarfile="${analyzers-stempel.jar}" property="analyzers-stempel.uptodate"/>
- </target>
-@@ -162,7 +162,7 @@
- <property name="analyzers-kuromoji.uptodate" value="true"/>
- </target>
-
-- <property name="grouping.jar"
value="${common.dir}/build/contrib/grouping/lucene-grouping-${version}.jar"/>
-+ <property name="grouping.jar"
value="${common.dir}/build/contrib/grouping/lucene-grouping.jar"/>
- <target name="check-grouping-uptodate" unless="grouping.uptodate">
- <contrib-uptodate name="grouping" jarfile="${grouping.jar}"
property="grouping.uptodate"/>
- </target>
-@@ -173,7 +173,7 @@
- <property name="grouping.uptodate" value="true"/>
- </target>
-
-- <property name="highlighter.jar"
value="${common.dir}/build/contrib/highlighter/lucene-highlighter-${version}.jar"/>
-+ <property name="highlighter.jar"
value="${common.dir}/build/contrib/highlighter/lucene-highlighter.jar"/>
- <target name="check-highlighter-uptodate" unless="highlighter.uptodate">
- <contrib-uptodate name="highlighter" jarfile="${highlighter.jar}"
property="highlighter.uptodate"/>
- </target>
-@@ -184,7 +184,7 @@
- <property name="highlighter.uptodate" value="true"/>
- </target>
-
-- <property name="icu.jar"
value="${common.dir}/build/contrib/icu/lucene-icu-${version}.jar"/>
-+ <property name="icu.jar"
value="${common.dir}/build/contrib/icu/lucene-icu.jar"/>
- <target name="check-icu-uptodate" unless="icu.uptodate">
- <contrib-uptodate name="icu" jarfile="${icu.jar}"
property="icu.uptodate"/>
- </target>
-@@ -195,7 +195,7 @@
- <property name="icu.uptodate" value="true"/>
- </target>
-
-- <property name="memory.jar"
value="${common.dir}/build/contrib/memory/lucene-memory-${version}.jar"/>
-+ <property name="memory.jar"
value="${common.dir}/build/contrib/memory/lucene-memory.jar"/>
- <target name="check-memory-uptodate" unless="memory.uptodate">
- <contrib-uptodate name="memory" jarfile="${memory.jar}"
property="memory.uptodate"/>
- </target>
-@@ -206,7 +206,7 @@
- <property name="memory.uptodate" value="true"/>
- </target>
-
-- <property name="misc.jar"
value="${common.dir}/build/contrib/misc/lucene-misc-${version}.jar"/>
-+ <property name="misc.jar"
value="${common.dir}/build/contrib/misc/lucene-misc.jar"/>
- <target name="check-misc-uptodate" unless="misc.uptodate">
- <contrib-uptodate name="misc" jarfile="${misc.jar}"
property="misc.uptodate"/>
- </target>
-@@ -217,7 +217,7 @@
- <property name="misc.uptodate" value="true"/>
- </target>
-
-- <property name="queries.jar"
value="${common.dir}/build/contrib/queries/lucene-queries-${version}.jar"/>
-+ <property name="queries.jar"
value="${common.dir}/build/contrib/queries/lucene-queries.jar"/>
- <target name="check-queries-uptodate" unless="queries.uptodate">
- <contrib-uptodate name="queries" jarfile="${queries.jar}"
property="queries.uptodate"/>
- </target>
-@@ -228,7 +228,7 @@
- <property name="queries.uptodate" value="true"/>
- </target>
-
-- <property name="queryparser.jar"
value="${common.dir}/build/contrib/queryparser/lucene-queryparser-${version}.jar"/>
-+ <property name="queryparser.jar"
value="${common.dir}/build/contrib/queryparser/lucene-queryparser.jar"/>
- <target name="check-queryparser-uptodate" unless="queryparser.uptodate">
- <contrib-uptodate name="queryparser" jarfile="${queryparser.jar}"
property="queryparser.uptodate"/>
- </target>
-@@ -239,7 +239,7 @@
- <property name="queryparser.uptodate" value="true"/>
- </target>
-
-- <property name="spatial.jar"
value="${common.dir}/build/contrib/spatial/lucene-spatial-${version}.jar"/>
-+ <property name="spatial.jar"
value="${common.dir}/build/contrib/spatial/lucene-spatial.jar"/>
- <target name="check-spatial-uptodate" unless="spatial.uptodate">
- <contrib-uptodate name="spatial" jarfile="${spatial.jar}"
property="spatial.uptodate"/>
- </target>
-@@ -250,7 +250,7 @@
- <property name="spatial.uptodate" value="true"/>
- </target>
-
-- <property name="spellchecker.jar"
value="${common.dir}/build/contrib/spellchecker/lucene-spellchecker-${version}.jar"/>
-+ <property name="spellchecker.jar"
value="${common.dir}/build/contrib/spellchecker/lucene-spellchecker.jar"/>
- <target name="check-spellchecker-uptodate" unless="spellchecker.uptodate">
- <contrib-uptodate name="spellchecker" jarfile="${spellchecker.jar}"
property="spellchecker.uptodate"/>
- </target>
diff --git a/debian/patches/disable-tests b/debian/patches/disable-tests
deleted file mode 100644
index 8b09f1b..0000000
--- a/debian/patches/disable-tests
+++ /dev/null
@@ -1,74 +0,0 @@
-Description: Disable the building and running of the test framework
- The test framework is currently disabled because it requires junit 4.7
- specifically and will not run with junit 4.8 currently in unstable
-Author: Mat Scales <m...@wibbly.org.uk>
-Index: lucene-solr/lucene/build.xml
-===================================================================
---- lucene-solr/lucene/build.xml 2011-11-29 09:21:37.509631787 +0000
-+++ lucene-solr/lucene/build.xml 2011-11-29 09:21:37.905632895 +0000
-@@ -182,7 +182,7 @@
-
- <target name="javadoc" depends="javadocs"/>
- <target name="javadocs" description="Generate javadoc"
-- depends="javadocs-all, javadocs-core, javadocs-contrib,
javadocs-test-framework">
-+ depends="javadocs-all, javadocs-core, javadocs-contrib">
- <echo file="${javadoc.dir}/index.html" append="false">
- <![CDATA[<html><head><title>${Name} ${version} Javadoc Index</title></head>
- <body>
-@@ -190,7 +190,6 @@
- <ul>
- <li><a href="all/index.html">All</a></li>
- <li><a href="core/index.html">Core</a></li>
-- <li><a href="test-framework/index.html">Test Framework</a></li>
- <li>Contrib packages:</li>
- <ul>
- ]]></echo>
-@@ -589,8 +588,7 @@
- </delete>
- </target>
-
-- <target name="build-contrib" depends="compile-test"
-- description="Builds all contrib modules and their tests">
-+ <target name="build-contrib" description="Builds all contrib modules and
their tests">
- <contrib-crawl target="build-artifacts-and-tests"/>
- </target>
-
-Index: lucene-solr/lucene/contrib/analyzers/build.xml
-===================================================================
---- lucene-solr/lucene/contrib/analyzers/build.xml 2011-11-29
09:21:25.833599112 +0000
-+++ lucene-solr/lucene/contrib/analyzers/build.xml 2011-11-29
09:21:37.905632895 +0000
-@@ -63,7 +63,7 @@
- <ant dir="stempel" target="test" />
- </target>
-
-- <target name="build-artifacts-and-tests" depends="default,compile-test" />
-+ <target name="build-artifacts-and-tests" depends="default" />
-
- <target name="dist-maven" depends="default">
- <ant dir="common" target="dist-maven" />
-Index: lucene-solr/lucene/contrib/contrib-build.xml
-===================================================================
---- lucene-solr/lucene/contrib/contrib-build.xml 2011-11-29
09:21:25.793599000 +0000
-+++ lucene-solr/lucene/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" />
- </target>
-- <target name="build-artifacts-and-tests" depends="jar, compile-test" />
-+ <target name="build-artifacts-and-tests" depends="jar" />
-
- <available
- type="file"
-Index: lucene-solr/lucene/contrib/xml-query-parser/build.xml
-===================================================================
---- lucene-solr/lucene/contrib/xml-query-parser/build.xml 2011-11-29
09:21:25.809599045 +0000
-+++ lucene-solr/lucene/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" />
-
- <!-- override contrib-build.xml target to also build web demo -->
-- <target name="build-artifacts-and-tests" depends="jar,
compile-test,build-web-demo" />
-+ <target name="build-artifacts-and-tests" depends="jar,build-web-demo" />
-
- <target name="default" depends="jar-lucene-core,jar-core,build-web-demo"/>
-
diff --git a/debian/patches/fix-lib-paths b/debian/patches/fix-lib-paths
deleted file mode 100644
index 2ab4995..0000000
--- a/debian/patches/fix-lib-paths
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Change where the build looks for shared jar files
- Since we strip all of the embedded jar files from the modified upstream source
- we need to change classpaths to point at the installed debianized versions in
- /usr/share/java.
-Author: Mat Scales <m...@wibbly.org.uk>
-Index: lucene-solr/lucene/contrib/benchmark/build.xml
-===================================================================
---- lucene-solr.orig/lucene/contrib/benchmark/build.xml 2011-11-29
09:21:26.029599661 +0000
-+++ lucene-solr/lucene/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"/>
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-beanutils.jar"/>
-+ <include name="commons-collections3.jar"/>
-+ <include name="commons-compress.jar"/>
-+ <include name="xercesImpl.jar"/>
-+ <include name="commons-digester.jar"/>
-+ <include name="commons-logging.jar"/>
- </fileset>
- </path>
- <path id="run.classpath">
-@@ -174,7 +179,7 @@
- <path id="collation.runtime.classpath">
- <path refid="run.classpath"/>
- <pathelement path="${icu.jar}"/>
-- <fileset dir="${common.dir}/contrib/icu/lib" includes="icu4j*.jar"/>
-+ <fileset dir="/usr/share/java" includes="com.ibm.icu-4.4.jar"/>
- </path>
-
- <target name="collation"
depends="compile,jar-icu,top-100k-wiki-word-files">
-Index: lucene-solr/lucene/contrib/icu/build.xml
-===================================================================
---- lucene-solr.orig/lucene/contrib/icu/build.xml 2011-11-29
09:21:26.069599773 +0000
-+++ lucene-solr/lucene/contrib/icu/build.xml 2011-11-29 09:21:37.293631182
+0000
-@@ -26,7 +26,7 @@
-
-
- <path id="additional.dependencies">
-- <fileset dir="lib" includes="icu4j-*.jar"/>
-+ <fileset dir="/usr/share/java" includes="com.ibm.icu-4.4.jar"/>
- </path>
-
- <pathconvert property="project.classpath"
-Index: lucene-solr/lucene/contrib/queries/build.xml
-===================================================================
---- lucene-solr.orig/lucene/contrib/queries/build.xml 2011-11-29
09:21:26.049599717 +0000
-+++ lucene-solr/lucene/contrib/queries/build.xml 2011-11-29
09:21:37.509631787 +0000
-@@ -24,7 +24,7 @@
- </description>
-
- <path id="additional.dependencies">
-- <fileset dir="lib" includes="*-oro-*.jar,*-regexp-*.jar"/>
-+ <fileset dir="/usr/share/java" includes="regexp.jar"/>
- </path>
-
- <pathconvert property="project.classpath"
-Index: lucene-solr/lucene/build.xml
-===================================================================
---- lucene-solr.orig/lucene/build.xml 2011-11-29 09:21:25.993599560 +0000
-+++ lucene-solr/lucene/build.xml 2011-11-29 09:21:37.509631787 +0000
-@@ -227,9 +227,15 @@
- <path id="javadoc.classpath">
- <path refid="classpath"/>
- <pathelement location="${ant.home}/lib/ant.jar"/>
-- <fileset dir=".">
-- <exclude name="build/**/*.jar"/>
-- <include name="**/lib/*.jar"/>
-+ <fileset dir="/usr/share/java">
-+ <include name="commons-beanutils.jar"/>
-+ <include name="commons-collections3.jar"/>
-+ <include name="commons-compress.jar"/>
-+ <include name="xercesImpl.jar"/>
-+ <include name="commons-digester.jar"/>
-+ <include name="commons-logging.jar"/>
-+ <include name="com.ibm.icu-4.4.jar"/>
-+ <include name="regexp.jar"/>
- </fileset>
- </path>
-
-Index: lucene-solr/lucene/common-build.xml
-===================================================================
---- lucene-solr.orig/lucene/common-build.xml 2011-11-29 09:21:26.009599605
+0000
-+++ lucene-solr/lucene/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"/>
-
-- <property name="javacc.home" location="${common.dir}"/>
-+ <property name="javacc.home" location="/usr/share/java">
- <property name="jflex.home" location="${common.dir}"/>
-
- <path id="jflex.classpath">
-@@ -151,8 +151,8 @@
- </path>
-
- <path id="javacc.classpath">
-- <fileset dir="${javacc.home}/">
-- <include name="bin/lib/*.jar"/>
-+ <fileset dir="${javacc.home}">
-+ <include name="javacc.jar"/>
- </fileset>
- </path>
-
diff --git a/debian/patches/remove-svnversion-calls
b/debian/patches/remove-svnversion-calls
deleted file mode 100644
index 027c715..0000000
--- a/debian/patches/remove-svnversion-calls
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Remove the calls to svnversion during the build process.
- The upstream build uses svnversion to get detailed build information to put
- into the jar manifests directly from Apache's version control. Debian's buildd
- servers can't make network connections during the build so we disable it.
-Author: Mat Scales <m...@wibbly.org.uk>
-Index: lucene-solr/lucene/common-build.xml
-===================================================================
---- lucene-solr.orig/lucene/common-build.xml 2011-11-29 09:21:37.509631787
+0000
-+++ lucene-solr/lucene/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"/>
-
-- <!--
-- we attempt to exec svnversion to get details build information
-- for jar manifests. this property can be set at runtime to an
-- explicit path as needed, or ant will just try to find it in the
-- default PATH. (this is useful for Hudson)
-- -->
-- <property name="svnversion.exe" value="svnversion" />
-- <property name="svn.exe" value="svn" />
--
- <property name="gpg.exe" value="gpg" />
- <property name="gpg.key" value="CODE SIGNING KEY" />
-
-@@ -404,7 +395,7 @@
- <attribute name="Implementation-Title"
value="@{implementation.title}"/>
- <!-- impl version can be any string -->
- <attribute name="Implementation-Version"
-- value="${version} ${svnversion} - ${user.name} - ${DSTAMP}
${TSTAMP}"/>
-+ value="${version} - ${DSTAMP} ${TSTAMP}"/>
- <attribute name="Implementation-Vendor"
- value="The Apache Software Foundation"/>
- <attribute name="X-Compile-Source-JDK" value="${javac.source}"/>
-@@ -423,12 +414,6 @@
- <attribute name="spec.version" default="${spec.version}"/>
- <element name="nested" optional="true" implicit="true"/>
- <sequential>
-- <!-- If possible, include the svnversion -->
-- <exec dir="." executable="${svnversion.exe}"
-- outputproperty="svnversion" failifexecutionfails="false">
-- <arg line="."/>
-- </exec>
--
- <build-manifest title="@{title}"
- implementation.title="@{implementation.title}"
- spec.version="@{spec.version}"/>
diff --git a/debian/patches/series b/debian/patches/series
index cc2a4fd..af018f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,5 @@
-#fix-lib-paths
-#disable-tests
-#remove-svnversion-calls
#add-osgi-manifest
javacc-system.patch
-#build-versionless-jars.patch
fix-jar-matches.patch
disable-ivy.patch
ignore-failing-tests.patch
--
lucene-solr 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
