The following commit has been merged in the master branch:
commit caeb93f0be6e37b378852cd5a18b5c298ffcfb64
Author: James Page <james.p...@canonical.com>
Date: Fri Oct 14 17:48:27 2011 +0100
New upstream release.
* New upstream release.
* Refreshed patches.
* Added myself to uploaders.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 2051d6b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build. Please see:
-
- /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 05cbf04..73b9cbd 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -4,4 +4,7 @@ TODO
run during the build.
* Work out the bnd issue where it thinks there is a header called "Name".
Apparently fixed in later versions but the debian package for bnd is very out
- of date.
\ No newline at end of file
+ of date.
+* Use JavaCC to regenerating Java files included in upstream tarball
+* Use JFlex to generate Java files included in upstream tarball (needs 1.5 -
not
+ yet released)
diff --git a/debian/changelog b/debian/changelog
index 83ed2e2..de59a68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lucene3 (3.4.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Refreshed patches.
+ * Added myself to uploaders.
+
+ -- James Page <james.p...@ubuntu.com> Fri, 14 Oct 2011 16:17:29 +0100
+
lucene3 (3.3.0+dfsg-1) unstable; urgency=low
* Initial release. (Closes: #594027)
diff --git a/debian/control b/debian/control
index 00074f3..b4505fb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: lucene3
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Mat Scales <m...@wibbly.org.uk>
+Uploaders: Mat Scales <m...@wibbly.org.uk>, James Page <james.p...@ubuntu.com>
Homepage: http://lucene.apache.org/java/
Standards-Version: 3.9.2
Build-Depends: ant,
@@ -10,6 +10,8 @@ Build-Depends: ant,
debhelper (>= 8),
default-jdk,
javahelper,
+ javacc,
+ jflex,
libcommons-beanutils-java,
libcommons-collections3-java,
libcommons-compress-java,
diff --git a/debian/copyright b/debian/copyright
index efbec5e..ce76b87 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Name: lucene3
Source: http://lucene.apache.org/java/docs/releases.html
The source orig.tar.gz for this Debian package was created by downloading the
upstream source and removing embedded libraries that are packaged in Debian.
-
+ .
Specifically:
./backwards
./lib/*
diff --git a/debian/liblucene3-java-contrib.dirs
b/debian/liblucene3-java-contrib.dirs
deleted file mode 100644
index f5cd8f2..0000000
--- a/debian/liblucene3-java-contrib.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
\ No newline at end of file
diff --git a/debian/liblucene3-java-contrib.install
b/debian/liblucene3-java-contrib.install
deleted file mode 100644
index 7fc4f14..0000000
--- a/debian/liblucene3-java-contrib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-build/contrib/analyzers/common/lucene-analyzers-3.3.0.jar /usr/share/java/
-build/contrib/analyzers/smartcn/lucene-smartcn-3.3.0.jar /usr/share/java/
-build/contrib/analyzers/stempel/lucene-stempel-3.3.0.jar /usr/share/java/
-build/contrib/benchmark/lucene-benchmark-3.3.0.jar /usr/share/java/
-build/contrib/demo/lucene-demo-3.3.0.jar /usr/share/java/
-build/contrib/grouping/lucene-grouping-3.3.0.jar /usr/share/java/
-build/contrib/highlighter/lucene-highlighter-3.3.0.jar /usr/share/java/
-build/contrib/icu/lucene-icu-3.3.0.jar /usr/share/java/
-build/contrib/instantiated/lucene-instantiated-3.3.0.jar /usr/share/java/
-build/contrib/memory/lucene-memory-3.3.0.jar /usr/share/java/
-build/contrib/misc/lucene-misc-3.3.0.jar /usr/share/java/
-build/contrib/queries/lucene-queries-3.3.0.jar /usr/share/java/
-build/contrib/queryparser/lucene-queryparser-3.3.0.jar /usr/share/java/
-build/contrib/remote/lucene-remote-3.3.0.jar /usr/share/java/
-build/contrib/spatial/lucene-spatial-3.3.0.jar /usr/share/java/
-build/contrib/spellchecker/lucene-spellchecker-3.3.0.jar /usr/share/java/
-build/contrib/wordnet/lucene-wordnet-3.3.0.jar /usr/share/java/
-build/contrib/xml-query-parser/lucene-xml-query-parser-3.3.0.jar
/usr/share/java/
diff --git a/debian/liblucene3-java-contrib.jlibs
b/debian/liblucene3-java-contrib.jlibs
new file mode 100644
index 0000000..8f4c081
--- /dev/null
+++ b/debian/liblucene3-java-contrib.jlibs
@@ -0,0 +1,17 @@
+build/contrib/analyzers/common/lucene-analyzers.jar
+build/contrib/analyzers/smartcn/lucene-smartcn.jar
+build/contrib/analyzers/stempel/lucene-stempel.jar
+build/contrib/benchmark/lucene-benchmark.jar
+build/contrib/demo/lucene-demo.jar
+build/contrib/grouping/lucene-grouping.jar
+build/contrib/highlighter/lucene-highlighter.jar
+build/contrib/icu/lucene-icu.jar
+build/contrib/instantiated/lucene-instantiated.jar
+build/contrib/memory/lucene-memory.jar
+build/contrib/misc/lucene-misc.jar
+build/contrib/queries/lucene-queries.jar
+build/contrib/queryparser/lucene-queryparser.jar
+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
diff --git a/debian/liblucene3-java-contrib.links
b/debian/liblucene3-java-contrib.links
deleted file mode 100644
index 8c7243d..0000000
--- a/debian/liblucene3-java-contrib.links
+++ /dev/null
@@ -1,18 +0,0 @@
-/usr/share/java/lucene-icu-3.3.0.jar
/usr/share/java/lucene-icu.jar
-/usr/share/java/lucene-spellchecker-3.3.0.jar
/usr/share/java/lucene-spellchecker.jar
-/usr/share/java/lucene-grouping-3.3.0.jar
/usr/share/java/lucene-grouping.jar
-/usr/share/java/lucene-memory-3.3.0.jar
/usr/share/java/lucene-memory.jar
-/usr/share/java/lucene-queryparser-3.3.0.jar
/usr/share/java/lucene-queryparser.jar
-/usr/share/java/lucene-remote-3.3.0.jar
/usr/share/java/lucene-remote.jar
-/usr/share/java/lucene-stempel-3.3.0.jar
/usr/share/java/lucene-stempel.jar
-/usr/share/java/lucene-smartcn-3.3.0.jar
/usr/share/java/lucene-smartcn.jar
-/usr/share/java/lucene-analyzers-3.3.0.jar
/usr/share/java/lucene-analyzers.jar
-/usr/share/java/lucene-misc-3.3.0.jar
/usr/share/java/lucene-misc.jar
-/usr/share/java/lucene-instantiated-3.3.0.jar
/usr/share/java/lucene-instantiated.jar
-/usr/share/java/lucene-demo-3.3.0.jar
/usr/share/java/lucene-demo.jar
-/usr/share/java/lucene-wordnet-3.3.0.jar
/usr/share/java/lucene-wordnet.jar
-/usr/share/java/lucene-highlighter-3.3.0.jar
/usr/share/java/lucene-highlighter.jar
-/usr/share/java/lucene-queries-3.3.0.jar
/usr/share/java/lucene-queries.jar
-/usr/share/java/lucene-spatial-3.3.0.jar
/usr/share/java/lucene-spatial.jar
-/usr/share/java/lucene-benchmark-3.3.0.jar
/usr/share/java/lucene-benchmark.jar
-/usr/share/java/lucene-xml-query-parser-3.3.0.jar
/usr/share/java/lucene-xml-query-parser.jar
diff --git a/debian/liblucene3-java-doc.docs b/debian/liblucene3-java-doc.docs
index 11504e3..fd1c57d 100644
--- a/debian/liblucene3-java-doc.docs
+++ b/debian/liblucene3-java-doc.docs
@@ -1,2 +1 @@
build/docs
-docs
\ No newline at end of file
diff --git a/debian/liblucene3-java.dirs b/debian/liblucene3-java.dirs
deleted file mode 100644
index f5cd8f2..0000000
--- a/debian/liblucene3-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
\ No newline at end of file
diff --git a/debian/liblucene3-java.docs b/debian/liblucene3-java.docs
index 66587cd..82303e6 100644
--- a/debian/liblucene3-java.docs
+++ b/debian/liblucene3-java.docs
@@ -1,5 +1,3 @@
BUILD.txt
-CHANGES.txt
NOTICE.txt
README.txt
-
diff --git a/debian/liblucene3-java.install b/debian/liblucene3-java.install
deleted file mode 100644
index 86e7aec..0000000
--- a/debian/liblucene3-java.install
+++ /dev/null
@@ -1 +0,0 @@
-build/lucene-core-3.3.0.jar /usr/share/java/
diff --git a/debian/liblucene3-java.jlibs b/debian/liblucene3-java.jlibs
new file mode 100644
index 0000000..ef4a3e1
--- /dev/null
+++ b/debian/liblucene3-java.jlibs
@@ -0,0 +1 @@
+build/lucene-core.jar
diff --git a/debian/liblucene3-java.links b/debian/liblucene3-java.links
deleted file mode 100644
index cd3a892..0000000
--- a/debian/liblucene3-java.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/java/lucene-core-3.3.0.jar
/usr/share/java/lucene-core.jar
\ No newline at end of file
diff --git a/debian/lucene.bnd b/debian/lucene.bnd
index e1f40fc..4c924a4 100644
--- a/debian/lucene.bnd
+++ b/debian/lucene.bnd
@@ -13,4 +13,4 @@ Bundle-SymbolicName: org.apache.lucene.${name}
Bundle-Name: Lucene Search Engine: ${ant.project.name}
Bundle-Vendor: The Apache Software Foundation
Bundle-Version: ${version}
-Bundle-DocURL: http://lucene.apache.org/
\ No newline at end of file
+Bundle-DocURL: http://lucene.apache.org/
diff --git a/debian/patches/add-osgi-manifest b/debian/patches/add-osgi-manifest
index 5953008..e1a7b8d 100644
--- a/debian/patches/add-osgi-manifest
+++ b/debian/patches/add-osgi-manifest
@@ -3,30 +3,50 @@ Description: Build jars as OSGi bundles
Author: Luca Stancapiano <je...@vige.it> (original)
Author: Mat Scales <m...@wibbly.org.uk> (debianization)
Origin: https://issues.apache.org/jira/browse/LUCENE-3167
---- a/common-build.xml
-+++ b/common-build.xml
-@@ -345,24 +345,18 @@
- <macrodef name="build-manifest" description="Builds a manifest file">
- <attribute name="title" default="Lucene Search Engine:
${ant.project.name}" />
- <sequential>
+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 @@
+ <attribute name="implementation.title"/>
+ <attribute name="spec.version"/>
+ <sequential>
- <manifest file="${manifest.file}">
+- <!--
+- http://java.sun.com/j2se/1.5.0/docs/guide/jar/jar.html#JAR%20Manifest
+-
http://java.sun.com/j2se/1.5.0/docs/guide/versioning/spec/versioning2.html
+- http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Package.html
+-
http://java.sun.com/j2se/1.5.0/docs/api/java/util/jar/package-summary.html
+-
http://java.sun.com/developer/Books/javaprogramming/JAR/basics/manifest.html
+- -->
+- <!-- Don't set 'Manifest-Version' it identifies the version of the
+- manifest file format, and should always be 1.0 (the default)
+-
+- Don't set 'Created-by' attribute, its purpose is
+- to identify the version of java used to build the jar,
+- which ant will do by default.
+-
+- Ant will happily override these with bogus strings if you
+- tell it to, so don't.
+-
+- NOTE: we don't use section info because all of our manifest data
+- applies to the entire jar/war ... no package specific info.
+- -->
+- <attribute name="Extension-Name" value="@{implementation.title}"/>
- <attribute name="Specification-Title" value="@{title}"/>
-- <!-- spec version must match "digit+{.digit+}*" -->
-- <attribute name="Specification-Version"
value="${spec.version}"/>
-- <attribute name="Specification-Vendor"
-- value="The Apache Software Foundation"/>
-- <attribute name="Implementation-Title"
value="org.apache.lucene"/>
-- <!-- impl version can be any string -->
-- <attribute name="Implementation-Version"
-- value="${version} - ${DSTAMP} ${TSTAMP}"/>
-- <attribute name="Implementation-Vendor"
-- value="The Apache Software Foundation"/>
-- <attribute name="X-Compile-Source-JDK"
-- value="${javac.source}"/>
-- <attribute name="X-Compile-Target-JDK"
-- value="${javac.target}"/>
-- </manifest>
-- </sequential>
+- <!-- spec version must match "digit+{.digit+}*" -->
+- <attribute name="Specification-Version" value="@{spec.version}"/>
+- <attribute name="Specification-Vendor"
+- value="The Apache Software Foundation"/>
+- <attribute name="Implementation-Title"
value="@{implementation.title}"/>
+- <!-- impl version can be any string -->
+- <attribute name="Implementation-Version"
+- value="${version} - ${DSTAMP} ${TSTAMP}"/>
+- <attribute name="Implementation-Vendor"
+- value="The Apache Software Foundation"/>
+- <attribute name="X-Compile-Source-JDK" value="${javac.source}"/>
+- <attribute name="X-Compile-Target-JDK" value="${javac.target}"/>
+- </manifest>
+ <xmlproperty file="${ant.file}" collapseAttributes="true" prefix="bnd"/>
+ <property name="bndclasspath" refid="classpath"/>
+ <property name="-savemanifest" value="${common.dir}/build/MANIFEST.MF"/>
@@ -38,7 +58,6 @@ Origin: https://issues.apache.org/jira/browse/LUCENE-3167
+ failok="true"
+ exceptions="true"
+ files="${common.dir}/debian/lucene.bnd" />
-+ </sequential>
+ </sequential>
</macrodef>
- <macrodef name="jarify" description="Builds a JAR file">
diff --git a/debian/patches/build-versionless-jars.patch
b/debian/patches/build-versionless-jars.patch
new file mode 100644
index 0000000..d08c987
--- /dev/null
+++ b/debian/patches/build-versionless-jars.patch
@@ -0,0 +1,143 @@
+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
+@@ -50,7 +50,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="junit.jar" value="junit-4.7.jar"/>
+ <property name="junit-location.jar" value="${common.dir}/lib/${junit.jar}"/>
+@@ -136,7 +136,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="/usr/share/java">
++ <property name="javacc.home" location="/usr/share/java"/>
+ <property name="jflex.home" location="${common.dir}"/>
+
+ <path id="jflex.classpath">
+@@ -399,7 +399,7 @@
+ </sequential>
+ </macrodef>
+
+- <property name="lucene-core.jar"
value="${common.dir}/build/lucene-core-${version}.jar"/>
++ <property name="lucene-core.jar"
value="${common.dir}/build/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}/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
+@@ -118,7 +118,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>
+@@ -129,7 +129,7 @@
+ <property name="analyzers-common.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>
+@@ -151,7 +151,7 @@
+ <property name="analyzers-stempel.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>
+@@ -162,7 +162,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>
+@@ -173,7 +173,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>
+@@ -184,7 +184,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>
+@@ -195,7 +195,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>
+@@ -206,7 +206,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>
+@@ -217,7 +217,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>
+@@ -228,7 +228,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>
+@@ -239,7 +239,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
index accea87..9cc1e68 100644
--- a/debian/patches/disable-tests
+++ b/debian/patches/disable-tests
@@ -2,9 +2,11 @@ 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>
---- a/build.xml
-+++ b/build.xml
-@@ -163,7 +163,7 @@
+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
+@@ -182,7 +182,7 @@
<target name="javadoc" depends="javadocs"/>
<target name="javadocs" description="Generate javadoc"
@@ -13,7 +15,7 @@ Author: Mat Scales <m...@wibbly.org.uk>
<echo file="${javadoc.dir}/index.html" append="false">
<![CDATA[<html><head><title>${Name} ${version} Javadoc Index</title></head>
<body>
-@@ -171,7 +171,6 @@
+@@ -190,7 +190,6 @@
<ul>
<li><a href="all/index.html">All</a></li>
<li><a href="core/index.html">Core</a></li>
@@ -21,9 +23,9 @@ Author: Mat Scales <m...@wibbly.org.uk>
<li>Contrib packages:</li>
<ul>
]]></echo>
-@@ -663,8 +662,7 @@
- </sequential>
- </macrodef>
+@@ -587,8 +586,7 @@
+ </delete>
+ </target>
- <target name="build-contrib" depends="compile-test"
- description="Builds all contrib modules and their tests">
@@ -31,8 +33,10 @@ Author: Mat Scales <m...@wibbly.org.uk>
<contrib-crawl target="build-artifacts-and-tests"/>
</target>
---- a/contrib/analyzers/build.xml
-+++ b/contrib/analyzers/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
@@ -63,7 +63,7 @@
<ant dir="stempel" target="test" />
</target>
@@ -42,9 +46,11 @@ Author: Mat Scales <m...@wibbly.org.uk>
<target name="dist-maven" depends="default">
<ant dir="common" target="dist-maven" />
---- a/contrib/contrib-build.xml
-+++ b/contrib/contrib-build.xml
-@@ -67,7 +67,7 @@
+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
+@@ -60,7 +60,7 @@
<target name="test" depends="init" if="contrib.has.tests">
<antcall target="common.test" inheritRefs="true" />
</target>
@@ -53,14 +59,16 @@ Author: Mat Scales <m...@wibbly.org.uk>
<available
type="file"
---- a/contrib/xml-query-parser/build.xml
-+++ b/contrib/xml-query-parser/build.xml
-@@ -51,7 +51,7 @@
- </target>
+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
+@@ -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-core,build-web-demo"/>
+ <target name="default" depends="jar-lucene-core,jar-core,build-web-demo"/>
diff --git a/debian/patches/enable-jflex b/debian/patches/enable-jflex
new file mode 100644
index 0000000..b8e5c53
--- /dev/null
+++ b/debian/patches/enable-jflex
@@ -0,0 +1,23 @@
+Description: Patch in Debian provided jflex for generating java source
+ during build.
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: not-needed
+
+Index: lucene3/common-build.xml
+===================================================================
+--- lucene3.orig/common-build.xml 2011-10-14 16:43:17.104113340 +0100
++++ lucene3/common-build.xml 2011-10-14 16:44:07.468499724 +0100
+@@ -140,11 +140,8 @@
+ <property name="jflex.home" location="${common.dir}"/>
+
+ <path id="jflex.classpath">
+- <fileset dir="${jflex.home}/">
+- <!-- for a JFlex trunk checkout: -->
+- <include name="jflex/target/*.jar"/>
+- <!-- for a JFlex distribution (not yet available): -->
+- <include name="lib/*.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="JFlex.jar"/>
+ </fileset>
+ </path>
+
diff --git a/debian/patches/fix-lib-paths b/debian/patches/fix-lib-paths
index d42671a..ea957ac 100644
--- a/debian/patches/fix-lib-paths
+++ b/debian/patches/fix-lib-paths
@@ -3,9 +3,11 @@ Description: Change where the build looks for shared jar files
we need to change classpaths to point at the installed debianized versions in
/usr/share/java.
Author: Mat Scales <m...@wibbly.org.uk>
---- a/contrib/benchmark/build.xml
-+++ b/contrib/benchmark/build.xml
-@@ -138,8 +138,13 @@
+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}"/>
<pathelement path="${analyzers-common.jar}"/>
<path refid="base.classpath"/>
@@ -21,7 +23,7 @@ Author: Mat Scales <m...@wibbly.org.uk>
</fileset>
</path>
<path id="run.classpath">
-@@ -180,7 +185,7 @@
+@@ -173,7 +178,7 @@
<path id="collation.runtime.classpath">
<path refid="run.classpath"/>
<pathelement path="${icu.jar}"/>
@@ -29,9 +31,11 @@ Author: Mat Scales <m...@wibbly.org.uk>
+ <fileset dir="/usr/share/java" includes="com.ibm.icu-4.4.jar"/>
</path>
- <target name="collation"
depends="compile,compile-icu,top-100k-wiki-word-files">
---- a/contrib/icu/build.xml
-+++ b/contrib/icu/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
@@ -26,7 +26,7 @@
@@ -41,8 +45,10 @@ Author: Mat Scales <m...@wibbly.org.uk>
</path>
<pathconvert property="project.classpath"
---- a/contrib/queries/build.xml
-+++ b/contrib/queries/build.xml
+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
@@ -24,7 +24,7 @@
</description>
@@ -52,9 +58,11 @@ Author: Mat Scales <m...@wibbly.org.uk>
</path>
<pathconvert property="project.classpath"
---- a/build.xml
-+++ b/build.xml
-@@ -208,9 +208,15 @@
+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
+@@ -227,9 +227,15 @@
<path id="javadoc.classpath">
<path refid="classpath"/>
<pathelement location="${ant.home}/lib/ant.jar"/>
@@ -71,5 +79,29 @@ Author: Mat Scales <m...@wibbly.org.uk>
+ <include name="com.ibm.icu-4.4.jar"/>
+ <include name="regexp.jar"/>
</fileset>
- <pathelement
location="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"/>
</path>
+
+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 @@
+ <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">
+@@ -149,8 +149,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
index 1e9bee8..209a1b0 100644
--- a/debian/patches/remove-svnversion-calls
+++ b/debian/patches/remove-svnversion-calls
@@ -3,9 +3,11 @@ Description: Remove the calls to svnversion during the build
process.
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>
---- a/common-build.xml
-+++ b/common-build.xml
-@@ -168,15 +168,6 @@
+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 @@
<property name="manifest.file" location="${common.dir}/build/MANIFEST.MF"/>
@@ -21,18 +23,18 @@ Author: Mat Scales <m...@wibbly.org.uk>
<property name="gpg.exe" value="gpg" />
<property name="gpg.key" value="CODE SIGNING KEY" />
-@@ -363,7 +354,7 @@
- <attribute name="Implementation-Title"
value="org.apache.lucene"/>
- <!-- impl version can be any string -->
- <attribute name="Implementation-Version"
-- value="${version} ${svnversion} - ${DSTAMP}
${TSTAMP}"/>
-+ value="${version} - ${DSTAMP} ${TSTAMP}"/>
- <attribute name="Implementation-Vendor"
- value="The Apache Software Foundation"/>
- <attribute name="X-Compile-Source-JDK"
-@@ -382,12 +373,6 @@
- <element name="manifest-attributes" optional="yes"/>
- <element name="metainf-includes" optional="yes"/>
+@@ -400,7 +391,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}"/>
+@@ -419,12 +410,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}"
@@ -40,6 +42,6 @@ Author: Mat Scales <m...@wibbly.org.uk>
- <arg line="."/>
- </exec>
-
- <build-manifest title="@{title}"/>
-
- <jar
+ <build-manifest title="@{title}"
+ implementation.title="@{implementation.title}"
+ spec.version="@{spec.version}"/>
diff --git a/debian/patches/series b/debian/patches/series
index 72e354d..dd53328 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-lib-paths
disable-tests
remove-svnversion-calls
add-osgi-manifest
+build-versionless-jars.patch
diff --git a/debian/rules b/debian/rules
index 0068e35..a52bfdb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,12 @@
export JAVA_HOME=/usr/lib/jvm/default-java
+
%:
dh $@ --with javahelper
override_dh_auto_build:
- ant -Dversion=3.3.0 jar-core docs javadocs build-contrib
+ ant -Dversion=3.4.0 jar-core docs javadocs build-contrib
override_dh_installchangelogs:
dh_installchangelogs CHANGES.txt
--
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
