[pkg-java] r18283 - in trunk/lucene2/debian: . patches source
Stephen Nelson
stephenonelson-guest at moszumanska.debian.org
Tue Jul 22 16:51:37 UTC 2014
Author: stephenonelson-guest
Date: 2014-07-22 16:51:37 +0000 (Tue, 22 Jul 2014)
New Revision: 18283
Added:
trunk/lucene2/debian/patches/01_remove_all_jarfiles.diff
trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.diff
trunk/lucene2/debian/patches/10_fix-javacc-locations.diff
trunk/lucene2/debian/patches/11_fix-javacc-generated-files.diff
trunk/lucene2/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.diff
trunk/lucene2/debian/patches/20_fix-java-compiler-version.diff
trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.diff
trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.diff
trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.diff
trunk/lucene2/debian/patches/45_fix-contrib-collation-libs.diff
trunk/lucene2/debian/patches/50_fix-contrib-db-libs.diff
trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.diff
trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.diff
trunk/lucene2/debian/patches/61_lucli-script.diff
trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.diff
trunk/lucene2/debian/patches/80_prevent-downloading-data-files.diff
trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.diff
trunk/lucene2/debian/patches/82_disable-svnversion-calls.diff
trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.diff
trunk/lucene2/debian/patches/series
Removed:
trunk/lucene2/debian/patches/00list
trunk/lucene2/debian/patches/01_remove_all_jarfiles.dpatch
trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch
trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch
trunk/lucene2/debian/patches/11_fix-javacc-generated-files.dpatch
trunk/lucene2/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch
trunk/lucene2/debian/patches/20_fix-java-compiler-version.dpatch
trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch
trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch
trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
trunk/lucene2/debian/patches/45_fix-contrib-collation-libs.dpatch
trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch
trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch
trunk/lucene2/debian/patches/61_lucli-script.dpatch
trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch
trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch
trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.dpatch
trunk/lucene2/debian/patches/82_disable-svnversion-calls.dpatch
trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.dpatch
trunk/lucene2/debian/patches/99debug_print-unittest-results.dpatch
Modified:
trunk/lucene2/debian/changelog
trunk/lucene2/debian/control
trunk/lucene2/debian/rules
trunk/lucene2/debian/source/format
Log:
Use quilt for patching as dpatch is deprecated.
Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/changelog 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,3 +1,10 @@
+lucene2 (2.9.4+ds1-5) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Convert package to use quilt for patching as dpatch is deprecated.
+
+ -- Stephen Nelson <stephen at eccostudio.com> Tue, 22 Jul 2014 17:30:44 +0100
+
lucene2 (2.9.4+ds1-4) unstable; urgency=low
[ Benjamin Drung ]
Modified: trunk/lucene2/debian/control
===================================================================
--- trunk/lucene2/debian/control 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/control 2014-07-22 16:51:37 UTC (rev 18283)
@@ -15,7 +15,6 @@
cdbs (>= 0.4.49),
debhelper (>= 6),
default-jdk,
- dpatch (>= 2.0),
javacc,
junit
Build-Depends-Indep: libcommons-beanutils-java (>= 1.7.0),
Deleted: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/00list 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,19 +0,0 @@
-01_remove_all_jarfiles.dpatch
-05_add-osgi-metadata-in-manifests.dpatch
-10_fix-javacc-locations.dpatch
-11_fix-javacc-generated-files.dpatch
-12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch
-20_fix-java-compiler-version.dpatch
-30_fix-contrib-ant-libs.dpatch
-31_fix-contrib-ant-test-wrong-encoding.dpatch
-40_fix-contrib-benchmark-libs.dpatch
-45_fix-contrib-collation-libs.dpatch
-50_fix-contrib-db-libs
-55_fix-contrib-db-je-libs
-60_fix-contrib-lucli-libs.dpatch
-61_lucli-script.dpatch
-70_fix-contrib-regex-libs.dpatch
-80_prevent-downloading-data-files
-81_disable-test-tag-backcompat-tests.dpatch
-82_disable-svnversion-calls
-83_fix-java-IPv4-networking.dpatch
Added: trunk/lucene2/debian/patches/01_remove_all_jarfiles.diff
===================================================================
--- trunk/lucene2/debian/patches/01_remove_all_jarfiles.diff (rev 0)
+++ trunk/lucene2/debian/patches/01_remove_all_jarfiles.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,33 @@
+#! /bin/sh
+## 01_remove_all_jarfiles.dpatch -- Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## DP: We want to be use we do not build using jar files contained
+## DP: in the Lucene distribution tarball, so we start by removing
+## DP: all jar files.
+
+OPERATION="$1"
+DIRECTORY="$2"
+
+if [ -z "$OPERATION" ]; then
+ echo "Illegal arguments"
+ exit 1
+fi
+
+if [ -z "$DIRECTORY" ]; then
+ DIRECTORY="."
+fi
+
+case "$OPERATION" in
+ -patch)
+ echo "Removing all jar files under $DIRECTORY"
+ find $DIRECTORY -name \*.jar -exec rm {} \;
+ ;;
+ -unpatch)
+ echo "Unable to magic back jar files..."
+ ;;
+ *)
+ echo "Illegal command line $1 $2"
+ exit 1
+ ;;
+esac
+
Property changes on: trunk/lucene2/debian/patches/01_remove_all_jarfiles.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/01_remove_all_jarfiles.dpatch
===================================================================
--- trunk/lucene2/debian/patches/01_remove_all_jarfiles.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/01_remove_all_jarfiles.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,33 +0,0 @@
-#! /bin/sh
-## 01_remove_all_jarfiles.dpatch -- Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## DP: We want to be use we do not build using jar files contained
-## DP: in the Lucene distribution tarball, so we start by removing
-## DP: all jar files.
-
-OPERATION="$1"
-DIRECTORY="$2"
-
-if [ -z "$OPERATION" ]; then
- echo "Illegal arguments"
- exit 1
-fi
-
-if [ -z "$DIRECTORY" ]; then
- DIRECTORY="."
-fi
-
-case "$OPERATION" in
- -patch)
- echo "Removing all jar files under $DIRECTORY"
- find $DIRECTORY -name \*.jar -exec rm {} \;
- ;;
- -unpatch)
- echo "Unable to magic back jar files..."
- ;;
- *)
- echo "Illegal command line $1 $2"
- exit 1
- ;;
-esac
-
Added: trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.diff
===================================================================
--- trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.diff (rev 0)
+++ trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,161 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_add-osgi-metadata-in-manifests.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/build.xml lucene2/build.xml
+--- lucene2~/build.xml 2010-08-06 13:44:30.000000000 +0200
++++ lucene2/build.xml 2010-08-06 13:44:32.000000000 +0200
+@@ -21,6 +21,16 @@
+
+ <property name="junit.includes" value="**/Test*.java"/>
+
++ <property name="OSGi.symbolicname" value="org.apache.lucene.core" />
++ <pathconvert property="OSGi.exportpackage" pathsep=",">
++ <dirset dir="src/java" excludes="org org/apache"/>
++ <mapper>
++ <chainedmapper>
++ <packagemapper from="${basedir}/src/java/*" to="*"/>
++ </chainedmapper>
++ </mapper>
++ </pathconvert>
++
+ <import file="common-build.xml"/>
+
+ <property name="build.demo.template" value="src/demo/demo-build.template"/>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/common-build.xml lucene2/common-build.xml
+--- lucene2~/common-build.xml 2010-08-06 13:44:30.000000000 +0200
++++ lucene2/common-build.xml 2010-08-06 13:46:16.000000000 +0200
+@@ -23,6 +23,8 @@
+ for standalone use.
+ </description>
+
++ <taskdef resource="net/sf/antcontrib/antlib.xml"/>
++
+ <dirname file="${ant.file.common}" property="common.dir"/>
+
+ <!-- Give user a chance to override without editing this file
+@@ -291,6 +293,15 @@
+ </macrodef>
+
+
++ <macrodef name="update-manifest-requirebundle"
++ description="Updates the Require-Bundle attribute of a manifest file">
++ <sequential>
++ <manifest file="${manifest.file}" mode="update">
++ <attribute name="Require-Bundle"
++ value="${OSGi.requirebundle}"/>
++ </manifest>
++ </sequential>
++ </macrodef>
+
+ <macrodef name="build-manifest" description="Builds a manifest file">
+ <attribute name="title" default="Lucene Search Engine: ${ant.project.name}" />
+@@ -311,6 +322,24 @@
+ value="${javac.source}"/>
+ <attribute name="X-Compile-Target-JDK"
+ value="${javac.target}"/>
++ <attribute name="Bundle-ManifestVersion"
++ value="2"/>
++ <attribute name="Bundle-SymbolicName"
++ value="${OSGi.symbolicname}"/>
++ <attribute name="Bundle-Name"
++ value="@{title}"/>
++ <attribute name="Bundle-Version"
++ value="${version}"/><!--
++ <attribute name="Bundle-Version"
++ value="1.9.1.v20080530-1600"/>-->
++ <attribute name="Bundle-RequiredExecutionEnvironment"
++ value="J2SE-1.5"/>
++ <attribute name="Bundle-Vendor"
++ value="The Apache Software Foundation"/>
++ <attribute name="Bundle-Localization"
++ value="plugin"/>
++ <attribute name="Export-Package"
++ value="${OSGi.exportpackage}"/>
+ </manifest>
+ </sequential>
+ </macrodef>
+@@ -328,6 +357,12 @@
+ </exec>
+
+ <build-manifest/>
++ <if>
++ <isset property="OSGi.requirebundle"/>
++ <then>
++ <update-manifest-requirebundle/>
++ </then>
++ </if>
+
+ <jar
+ destfile="@{destfile}"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/analyzers/common/build.xml lucene2/contrib/analyzers/common/build.xml
+--- lucene2~/contrib/analyzers/common/build.xml 2010-08-06 13:44:30.000000000 +0200
++++ lucene2/contrib/analyzers/common/build.xml 2010-08-06 13:44:32.000000000 +0200
+@@ -30,8 +30,18 @@
+ <property name="dist.dir" location="../../../dist/contrib/analyzers/common" />
+ <property name="maven.dist.dir" location="../../../dist/maven" />
+
++ <property name="OSGi.symbolicname" value="org.apache.lucene.analysis" />
++ <pathconvert property="OSGi.exportpackage" pathsep=",">
++ <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/>
++ <mapper>
++ <chainedmapper>
++ <packagemapper from="${basedir}/src/java/*" to="*"/>
++ </chainedmapper>
++ </mapper>
++ </pathconvert>
++
+ <import file="../../contrib-build.xml"/>
+-
++
+ <path id="test.classpath">
+ <path refid="classpath"/>
+ <pathelement location="../../../build/classes/test/"/>
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/analyzers/smartcn/build.xml lucene2/contrib/analyzers/smartcn/build.xml
+--- lucene2~/contrib/analyzers/smartcn/build.xml 2010-08-06 13:44:30.000000000 +0200
++++ lucene2/contrib/analyzers/smartcn/build.xml 2010-08-06 13:44:32.000000000 +0200
+@@ -30,6 +30,15 @@
+ <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />
+ <property name="maven.dist.dir" location="../../../dist/maven" />
+
++ <pathconvert property="OSGi.exportpackage" pathsep=",">
++ <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/>
++ <mapper>
++ <chainedmapper>
++ <packagemapper from="${basedir}/src/java/*" to="*"/>
++ </chainedmapper>
++ </mapper>
++ </pathconvert>
++
+ <import file="../../contrib-build.xml"/>
+
+ <path id="test.classpath">
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/contrib-build.xml lucene2/contrib/contrib-build.xml
+--- lucene2~/contrib/contrib-build.xml 2010-08-06 13:44:30.000000000 +0200
++++ lucene2/contrib/contrib-build.xml 2010-08-06 13:44:32.000000000 +0200
+@@ -24,7 +24,21 @@
+ <property name="build.dir" location="../../build/contrib/${ant.project.name}"/>
+ <property name="dist.dir" location="../../dist/contrib/${ant.project.name}"/>
+ <property name="maven.dist.dir" location="../../dist/maven"/>
+-
++
++ <!-- these can be overridden in the separate contrib
++ build.xml files -->
++ <property name="OSGi.requirebundle"
++ value='org.apache.lucene.core;bundle-version="${version}";visibility:=reexport' />
++ <property name="OSGi.symbolicname" value="org.apache.lucene.${ant.project.name}" />
++ <pathconvert property="OSGi.exportpackage" pathsep=",">
++ <dirset dir="src/java" excludes="org org/apache org/apache/lucene"/>
++ <mapper>
++ <chainedmapper>
++ <packagemapper from="${basedir}/src/java/*" to="*"/>
++ </chainedmapper>
++ </mapper>
++ </pathconvert>
++
+ <import file="../common-build.xml"/>
+
+ <property name="lucene.jar" location="${common.dir}/build/lucene-core-${version}.jar"/>
Property changes on: trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch
===================================================================
--- trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,161 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_add-osgi-metadata-in-manifests.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/build.xml lucene2/build.xml
---- lucene2~/build.xml 2010-08-06 13:44:30.000000000 +0200
-+++ lucene2/build.xml 2010-08-06 13:44:32.000000000 +0200
-@@ -21,6 +21,16 @@
-
- <property name="junit.includes" value="**/Test*.java"/>
-
-+ <property name="OSGi.symbolicname" value="org.apache.lucene.core" />
-+ <pathconvert property="OSGi.exportpackage" pathsep=",">
-+ <dirset dir="src/java" excludes="org org/apache"/>
-+ <mapper>
-+ <chainedmapper>
-+ <packagemapper from="${basedir}/src/java/*" to="*"/>
-+ </chainedmapper>
-+ </mapper>
-+ </pathconvert>
-+
- <import file="common-build.xml"/>
-
- <property name="build.demo.template" value="src/demo/demo-build.template"/>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/common-build.xml lucene2/common-build.xml
---- lucene2~/common-build.xml 2010-08-06 13:44:30.000000000 +0200
-+++ lucene2/common-build.xml 2010-08-06 13:46:16.000000000 +0200
-@@ -23,6 +23,8 @@
- for standalone use.
- </description>
-
-+ <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-+
- <dirname file="${ant.file.common}" property="common.dir"/>
-
- <!-- Give user a chance to override without editing this file
-@@ -291,6 +293,15 @@
- </macrodef>
-
-
-+ <macrodef name="update-manifest-requirebundle"
-+ description="Updates the Require-Bundle attribute of a manifest file">
-+ <sequential>
-+ <manifest file="${manifest.file}" mode="update">
-+ <attribute name="Require-Bundle"
-+ value="${OSGi.requirebundle}"/>
-+ </manifest>
-+ </sequential>
-+ </macrodef>
-
- <macrodef name="build-manifest" description="Builds a manifest file">
- <attribute name="title" default="Lucene Search Engine: ${ant.project.name}" />
-@@ -311,6 +322,24 @@
- value="${javac.source}"/>
- <attribute name="X-Compile-Target-JDK"
- value="${javac.target}"/>
-+ <attribute name="Bundle-ManifestVersion"
-+ value="2"/>
-+ <attribute name="Bundle-SymbolicName"
-+ value="${OSGi.symbolicname}"/>
-+ <attribute name="Bundle-Name"
-+ value="@{title}"/>
-+ <attribute name="Bundle-Version"
-+ value="${version}"/><!--
-+ <attribute name="Bundle-Version"
-+ value="1.9.1.v20080530-1600"/>-->
-+ <attribute name="Bundle-RequiredExecutionEnvironment"
-+ value="J2SE-1.5"/>
-+ <attribute name="Bundle-Vendor"
-+ value="The Apache Software Foundation"/>
-+ <attribute name="Bundle-Localization"
-+ value="plugin"/>
-+ <attribute name="Export-Package"
-+ value="${OSGi.exportpackage}"/>
- </manifest>
- </sequential>
- </macrodef>
-@@ -328,6 +357,12 @@
- </exec>
-
- <build-manifest/>
-+ <if>
-+ <isset property="OSGi.requirebundle"/>
-+ <then>
-+ <update-manifest-requirebundle/>
-+ </then>
-+ </if>
-
- <jar
- destfile="@{destfile}"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/analyzers/common/build.xml lucene2/contrib/analyzers/common/build.xml
---- lucene2~/contrib/analyzers/common/build.xml 2010-08-06 13:44:30.000000000 +0200
-+++ lucene2/contrib/analyzers/common/build.xml 2010-08-06 13:44:32.000000000 +0200
-@@ -30,8 +30,18 @@
- <property name="dist.dir" location="../../../dist/contrib/analyzers/common" />
- <property name="maven.dist.dir" location="../../../dist/maven" />
-
-+ <property name="OSGi.symbolicname" value="org.apache.lucene.analysis" />
-+ <pathconvert property="OSGi.exportpackage" pathsep=",">
-+ <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/>
-+ <mapper>
-+ <chainedmapper>
-+ <packagemapper from="${basedir}/src/java/*" to="*"/>
-+ </chainedmapper>
-+ </mapper>
-+ </pathconvert>
-+
- <import file="../../contrib-build.xml"/>
--
-+
- <path id="test.classpath">
- <path refid="classpath"/>
- <pathelement location="../../../build/classes/test/"/>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/analyzers/smartcn/build.xml lucene2/contrib/analyzers/smartcn/build.xml
---- lucene2~/contrib/analyzers/smartcn/build.xml 2010-08-06 13:44:30.000000000 +0200
-+++ lucene2/contrib/analyzers/smartcn/build.xml 2010-08-06 13:44:32.000000000 +0200
-@@ -30,6 +30,15 @@
- <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />
- <property name="maven.dist.dir" location="../../../dist/maven" />
-
-+ <pathconvert property="OSGi.exportpackage" pathsep=",">
-+ <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/>
-+ <mapper>
-+ <chainedmapper>
-+ <packagemapper from="${basedir}/src/java/*" to="*"/>
-+ </chainedmapper>
-+ </mapper>
-+ </pathconvert>
-+
- <import file="../../contrib-build.xml"/>
-
- <path id="test.classpath">
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/contrib-build.xml lucene2/contrib/contrib-build.xml
---- lucene2~/contrib/contrib-build.xml 2010-08-06 13:44:30.000000000 +0200
-+++ lucene2/contrib/contrib-build.xml 2010-08-06 13:44:32.000000000 +0200
-@@ -24,7 +24,21 @@
- <property name="build.dir" location="../../build/contrib/${ant.project.name}"/>
- <property name="dist.dir" location="../../dist/contrib/${ant.project.name}"/>
- <property name="maven.dist.dir" location="../../dist/maven"/>
--
-+
-+ <!-- these can be overridden in the separate contrib
-+ build.xml files -->
-+ <property name="OSGi.requirebundle"
-+ value='org.apache.lucene.core;bundle-version="${version}";visibility:=reexport' />
-+ <property name="OSGi.symbolicname" value="org.apache.lucene.${ant.project.name}" />
-+ <pathconvert property="OSGi.exportpackage" pathsep=",">
-+ <dirset dir="src/java" excludes="org org/apache org/apache/lucene"/>
-+ <mapper>
-+ <chainedmapper>
-+ <packagemapper from="${basedir}/src/java/*" to="*"/>
-+ </chainedmapper>
-+ </mapper>
-+ </pathconvert>
-+
- <import file="../common-build.xml"/>
-
- <property name="lucene.jar" location="${common.dir}/build/lucene-core-${version}.jar"/>
Added: trunk/lucene2/debian/patches/10_fix-javacc-locations.diff
===================================================================
--- trunk/lucene2/debian/patches/10_fix-javacc-locations.diff (rev 0)
+++ trunk/lucene2/debian/patches/10_fix-javacc-locations.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix-javacc-locations.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix lucene's build configuration to find javacc
+
+ at DPATCH@
+diff -urNad lucene2-2.3.0~/common-build.xml lucene2-2.3.0/common-build.xml
+--- lucene2-2.3.0~/common-build.xml 2008-01-26 15:39:14.000000000 +0530
++++ lucene2-2.3.0/common-build.xml 2008-01-26 15:42:13.000000000 +0530
+@@ -69,7 +69,8 @@
+ <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="javacc.jar" location="${javacc.home}/javacc.jar"/>
+ <property name="jflex.home" location="${common.dir}"/>
+
+ <property name="junit.output.dir" location="${build.dir}/test"/>
+@@ -101,7 +102,7 @@
+ <available
+ property="javacc.present"
+ classname="org.javacc.parser.Main"
+- classpath="${javacc.home}/bin/lib/javacc.jar"
++ classpath="${javacc.jar}"
+ />
+
+ <available
Property changes on: trunk/lucene2/debian/patches/10_fix-javacc-locations.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch
===================================================================
--- trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix-javacc-locations.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix lucene's build configuration to find javacc
-
- at DPATCH@
-diff -urNad lucene2-2.3.0~/common-build.xml lucene2-2.3.0/common-build.xml
---- lucene2-2.3.0~/common-build.xml 2008-01-26 15:39:14.000000000 +0530
-+++ lucene2-2.3.0/common-build.xml 2008-01-26 15:42:13.000000000 +0530
-@@ -69,7 +69,8 @@
- <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="javacc.jar" location="${javacc.home}/javacc.jar"/>
- <property name="jflex.home" location="${common.dir}"/>
-
- <property name="junit.output.dir" location="${build.dir}/test"/>
-@@ -101,7 +102,7 @@
- <available
- property="javacc.present"
- classname="org.javacc.parser.Main"
-- classpath="${javacc.home}/bin/lib/javacc.jar"
-+ classpath="${javacc.jar}"
- />
-
- <available
Added: trunk/lucene2/debian/patches/11_fix-javacc-generated-files.diff
===================================================================
--- trunk/lucene2/debian/patches/11_fix-javacc-generated-files.diff (rev 0)
+++ trunk/lucene2/debian/patches/11_fix-javacc-generated-files.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_fix-javacc-generated-files.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad lucene2~/contrib/queryparser/build.xml lucene2/contrib/queryparser/build.xml
+--- lucene2~/contrib/queryparser/build.xml 2009-10-08 18:23:39.000000000 +0200
++++ lucene2/contrib/queryparser/build.xml 2009-10-08 18:24:45.000000000 +0200
+@@ -54,8 +54,8 @@
+ match="^ public ParseException\(Token currentTokenVal.*$(\s\s[^}].*\n)* \}"
+ replace=" public ParseException(Token currentTokenVal,
+ int[][] expectedTokenSequencesVal, String[] tokenImageVal) {
+- super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, initialise(
+- currentTokenVal, expectedTokenSequencesVal, tokenImageVal)));
++ super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, new Object[]{initialise(
++ currentTokenVal, expectedTokenSequencesVal, tokenImageVal)}));
+ this.currentToken = currentTokenVal;
+ this.expectedTokenSequences = expectedTokenSequencesVal;
+ this.tokenImage = tokenImageVal;
+@@ -72,7 +72,7 @@
+ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java"
+ match="^ public ParseException\(\).*$(\s\s[^}].*\n)* \}"
+ replace=" public ParseException() {
+- super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, "Error"));
++ super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, new Object[]{"Error"}));
+ }"
+ flags="gm"
+ byline="false"/>
+@@ -88,6 +88,11 @@
+ replace=" static private String add_escapes(String str) {"
+ flags="g"
+ byline="false"/>
++ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java"
++ match="Message message = new MessageImpl\(QueryParserMessages.INVALID_SYNTAX_CANNOT_PARSE, query, tme.getMessage\(\)\);"
++ replace="Message message = new MessageImpl(QueryParserMessages.INVALID_SYNTAX_CANNOT_PARSE, new Object[]{query, tme.getMessage()});"
++ flags="g"
++ byline="false"/>
+ </target>
+
+ </project>
Property changes on: trunk/lucene2/debian/patches/11_fix-javacc-generated-files.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/11_fix-javacc-generated-files.dpatch
===================================================================
--- trunk/lucene2/debian/patches/11_fix-javacc-generated-files.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/11_fix-javacc-generated-files.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_fix-javacc-generated-files.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad lucene2~/contrib/queryparser/build.xml lucene2/contrib/queryparser/build.xml
---- lucene2~/contrib/queryparser/build.xml 2009-10-08 18:23:39.000000000 +0200
-+++ lucene2/contrib/queryparser/build.xml 2009-10-08 18:24:45.000000000 +0200
-@@ -54,8 +54,8 @@
- match="^ public ParseException\(Token currentTokenVal.*$(\s\s[^}].*\n)* \}"
- replace=" public ParseException(Token currentTokenVal,
- int[][] expectedTokenSequencesVal, String[] tokenImageVal) {
-- super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, initialise(
-- currentTokenVal, expectedTokenSequencesVal, tokenImageVal)));
-+ super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, new Object[]{initialise(
-+ currentTokenVal, expectedTokenSequencesVal, tokenImageVal)}));
- this.currentToken = currentTokenVal;
- this.expectedTokenSequences = expectedTokenSequencesVal;
- this.tokenImage = tokenImageVal;
-@@ -72,7 +72,7 @@
- <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java"
- match="^ public ParseException\(\).*$(\s\s[^}].*\n)* \}"
- replace=" public ParseException() {
-- super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, "Error"));
-+ super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, new Object[]{"Error"}));
- }"
- flags="gm"
- byline="false"/>
-@@ -88,6 +88,11 @@
- replace=" static private String add_escapes(String str) {"
- flags="g"
- byline="false"/>
-+ <replaceregexp file="src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java"
-+ match="Message message = new MessageImpl\(QueryParserMessages.INVALID_SYNTAX_CANNOT_PARSE, query, tme.getMessage\(\)\);"
-+ replace="Message message = new MessageImpl(QueryParserMessages.INVALID_SYNTAX_CANNOT_PARSE, new Object[]{query, tme.getMessage()});"
-+ flags="g"
-+ byline="false"/>
- </target>
-
- </project>
Added: trunk/lucene2/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.diff
===================================================================
--- trunk/lucene2/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.diff (rev 0)
+++ trunk/lucene2/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix bug that causes false positive failure in the test
+## DP: Apache Lucene svn revision 834011
+
+ at DPATCH@
+--- a/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java
++++ b/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java
+@@ -80,7 +80,8 @@
+ searcher = new IndexSearcher(directory);
+
+ String qtxt = "one";
+- for (int i = 0; i < docText.length; i++) {
++ // start from 1, so that the 0th doc never matches
++ for (int i = 1; i < docText.length; i++) {
+ qtxt += ' ' + docText[i]; // large query so that search will be longer
+ }
+ QueryParser queryParser = new QueryParser(FIELD_NAME, new WhitespaceAnalyzer());
+--- a/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
++++ b/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
+@@ -82,7 +82,8 @@
+ searcher = new IndexSearcher(directory);
+
+ String qtxt = "one";
+- for (int i = 0; i < docText.length; i++) {
++ // start from 1, so that the 0th doc never matches
++ for (int i = 1; i < docText.length; i++) {
+ qtxt += ' ' + docText[i]; // large query so that search will be longer
+ }
+ QueryParser queryParser = new QueryParser(FIELD_NAME, new WhitespaceAnalyzer());
Deleted: trunk/lucene2/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch
===================================================================
--- trunk/lucene2/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix bug that causes false positive failure in the test
-## DP: Apache Lucene svn revision 834011
-
- at DPATCH@
-diff -urNad lucene2~/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java lucene2/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java
---- lucene2~/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java 2009-10-23 17:21:47.000000000 +0200
-+++ lucene2/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java 2010-01-22 12:49:03.000000000 +0100
-@@ -80,7 +80,8 @@
- searcher = new IndexSearcher(directory);
-
- String qtxt = "one";
-- for (int i = 0; i < docText.length; i++) {
-+ // start from 1, so that the 0th doc never matches
-+ for (int i = 1; i < docText.length; i++) {
- qtxt += ' ' + docText[i]; // large query so that search will be longer
- }
- QueryParser queryParser = new QueryParser(FIELD_NAME, new WhitespaceAnalyzer());
-diff -urNad lucene2~/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java lucene2/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
---- lucene2~/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java 2009-10-23 17:21:47.000000000 +0200
-+++ lucene2/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java 2010-01-22 12:44:21.000000000 +0100
-@@ -82,7 +82,8 @@
- searcher = new IndexSearcher(directory);
-
- String qtxt = "one";
-- for (int i = 0; i < docText.length; i++) {
-+ // start from 1, so that the 0th doc never matches
-+ for (int i = 1; i < docText.length; i++) {
- qtxt += ' ' + docText[i]; // large query so that search will be longer
- }
- QueryParser queryParser = new QueryParser(FIELD_NAME, new WhitespaceAnalyzer());
Added: trunk/lucene2/debian/patches/20_fix-java-compiler-version.diff
===================================================================
--- trunk/lucene2/debian/patches/20_fix-java-compiler-version.diff (rev 0)
+++ trunk/lucene2/debian/patches/20_fix-java-compiler-version.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_fix-java-compiler-version.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Source version 1.5 needed because of annotations. The Debian package
+## DP: already depends on java >= 1.5
+
+ at DPATCH@
+--- a/common-build.xml
++++ b/common-build.xml
+@@ -60,8 +60,8 @@
+
+ <property name="javac.deprecation" value="off"/>
+ <property name="javac.debug" value="on"/>
+- <property name="javac.source" value="1.4"/>
+- <property name="javac.target" value="1.4"/>
++ <property name="javac.source" value="1.5"/>
++ <property name="javac.target" value="1.5"/>
+
+ <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
+ <property name="javadoc.access" value="protected"/>
Deleted: trunk/lucene2/debian/patches/20_fix-java-compiler-version.dpatch
===================================================================
--- trunk/lucene2/debian/patches/20_fix-java-compiler-version.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/20_fix-java-compiler-version.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_fix-java-compiler-version.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Source version 1.5 needed because of annotations. The Debian package
-## DP: already depends on java >= 1.5
-
- at DPATCH@
-diff -urNad lucene2~/common-build.xml lucene2/common-build.xml
---- lucene2~/common-build.xml 2009-11-03 22:32:24.000000000 +0100
-+++ lucene2/common-build.xml 2009-11-03 22:35:55.000000000 +0100
-@@ -58,8 +58,8 @@
-
- <property name="javac.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
-- <property name="javac.source" value="1.4"/>
-- <property name="javac.target" value="1.4"/>
-+ <property name="javac.source" value="1.5"/>
-+ <property name="javac.target" value="1.5"/>
-
- <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
- <property name="javadoc.access" value="protected"/>
Added: trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.diff
===================================================================
--- trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.diff (rev 0)
+++ trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_fix-contrib-ant-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Link contrib/ant to the libraries from /usr/share/java instead of
+## DP: to the (removed) libraries from lib/
+
+ at DPATCH@
+diff -urNad trunk~/contrib/ant/build.xml trunk/contrib/ant/build.xml
+--- trunk~/contrib/ant/build.xml 2007-06-04 06:02:05.000000000 +0200
++++ trunk/contrib/ant/build.xml 2007-06-05 13:30:58.000000000 +0200
+@@ -25,7 +25,7 @@
+
+ <path id="additional.dependencies">
+ <!-- TODO: make ${tidy.jar} property -->
+- <pathelement location="lib/Tidy.jar"/>
++ <pathelement location="/usr/share/java/jtidy.jar"/>
+ </path>
+
+ <pathconvert property="project.classpath"
Property changes on: trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/30_fix-contrib-ant-libs.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_fix-contrib-ant-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link contrib/ant to the libraries from /usr/share/java instead of
-## DP: to the (removed) libraries from lib/
-
- at DPATCH@
-diff -urNad trunk~/contrib/ant/build.xml trunk/contrib/ant/build.xml
---- trunk~/contrib/ant/build.xml 2007-06-04 06:02:05.000000000 +0200
-+++ trunk/contrib/ant/build.xml 2007-06-05 13:30:58.000000000 +0200
-@@ -25,7 +25,7 @@
-
- <path id="additional.dependencies">
- <!-- TODO: make ${tidy.jar} property -->
-- <pathelement location="lib/Tidy.jar"/>
-+ <pathelement location="/usr/share/java/jtidy.jar"/>
- </path>
-
- <pathconvert property="project.classpath"
Added: trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.diff
===================================================================
--- trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.diff (rev 0)
+++ trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 31_fix-contrib-ant-test-wrong-encoding.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The URL decoding caused the test to fail when building with pbuilder,
+## DP: because the '+' sign in the Debian version number was converted to
+## DP: a space. This patch removes the URL decoding.
+
+ at DPATCH@
+--- a/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java
++++ b/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java
+@@ -33,7 +33,7 @@
+ String fullname =
+ this.getClass().getResource(filename).getFile();
+
+- File file = new File(URLDecoder.decode(fullname, "UTF-8"));
++ File file = new File(fullname);
+
+ return file;
+ }
Deleted: trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch
===================================================================
--- trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 31_fix-contrib-ant-test-wrong-encoding.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The URL decoding caused the test to fail when building with pbuilder,
-## DP: because the '+' sign in the Debian version number was converted to
-## DP: a space. This patch removes the URL decoding.
-
- at DPATCH@
-diff -urNad lucene2~/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java lucene2/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java
---- lucene2~/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java 2009-06-27 12:58:40.000000000 +0200
-+++ lucene2/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java 2009-11-05 09:34:23.000000000 +0100
-@@ -33,7 +33,7 @@
- String fullname =
- this.getClass().getResource(filename).getFile();
-
-- File file = new File(URLDecoder.decode(fullname, "UTF-8"));
-+ File file = new File(fullname);
-
- return file;
- }
Added: trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.diff
===================================================================
--- trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.diff (rev 0)
+++ trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 39_fix-contrib-benchmark-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- a/contrib/benchmark/build.xml
++++ b/contrib/benchmark/build.xml
+@@ -110,9 +110,13 @@
+ <pathelement path="${common.dir}/build/contrib/highlighter/classes/java"/>
+ <pathelement path="${common.dir}/build/contrib/memory/classes/java"/>
+ <pathelement path="${common.dir}/build/contrib/fast-vector-highlighter/classes/java"/>
+- <fileset dir="lib">
+- <include name="**/*.jar"/>
+- </fileset>
++ <pathelement path="/usr/share/java/commons-digester.jar"/>
++ <pathelement path="/usr/share/java/commons-collections.jar"/>
++ <pathelement path="/usr/share/java/commons-compress.jar"/>
++ <pathelement path="/usr/share/java/commons-logging.jar"/>
++ <pathelement path="/usr/share/java/commons-beanutils.jar"/>
++ <pathelement path="/usr/share/java/xercesImpl.jar"/>
++ <pathelement path="/usr/share/java/xml-apis.jar"/>
+ </path>
+ <path id="run.classpath">
+ <path refid="classpath"/>
Deleted: trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 39_fix-contrib-benchmark-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad lucene2~/contrib/benchmark/build.xml lucene2/contrib/benchmark/build.xml
---- lucene2~/contrib/benchmark/build.xml 2009-08-20 09:34:18.000000000 +0200
-+++ lucene2/contrib/benchmark/build.xml 2009-08-20 09:35:09.000000000 +0200
-@@ -107,9 +107,13 @@
- <pathelement path="${common.dir}/build/contrib/highlighter/classes/java"/>
- <pathelement path="${common.dir}/build/contrib/memory/classes/java"/>
- <pathelement path="${common.dir}/build/contrib/fast-vector-highlighter/classes/java"/>
-- <fileset dir="lib">
-- <include name="**/*.jar"/>
-- </fileset>
-+ <pathelement path="/usr/share/java/commons-digester.jar"/>
-+ <pathelement path="/usr/share/java/commons-collections.jar"/>
-+ <pathelement path="/usr/share/java/commons-compress.jar"/>
-+ <pathelement path="/usr/share/java/commons-logging.jar"/>
-+ <pathelement path="/usr/share/java/commons-beanutils.jar"/>
-+ <pathelement path="/usr/share/java/xercesImpl.jar"/>
-+ <pathelement path="/usr/share/java/xml-apis.jar"/>
- </path>
- <path id="run.classpath">
- <path refid="classpath"/>
Added: trunk/lucene2/debian/patches/45_fix-contrib-collation-libs.diff
===================================================================
--- trunk/lucene2/debian/patches/45_fix-contrib-collation-libs.diff (rev 0)
+++ trunk/lucene2/debian/patches/45_fix-contrib-collation-libs.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 45_fix-contrib-collation-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad lucene2~/contrib/collation/build.xml lucene2/contrib/collation/build.xml
+--- lucene2~/contrib/collation/build.xml 2009-08-19 20:22:41.000000000 +0200
++++ lucene2/contrib/collation/build.xml 2009-08-20 11:16:40.000000000 +0200
+@@ -26,7 +26,7 @@
+
+
+ <path id="additional.dependencies">
+- <fileset dir="lib" includes="icu4j-*.jar"/>
++ <pathelement location="/usr/share/java/icu4j.jar"/>
+ <pathelement location="../../build/contrib/misc/classes/java"/>
+ </path>
+
Property changes on: trunk/lucene2/debian/patches/45_fix-contrib-collation-libs.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/45_fix-contrib-collation-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/45_fix-contrib-collation-libs.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/45_fix-contrib-collation-libs.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 45_fix-contrib-collation-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad lucene2~/contrib/collation/build.xml lucene2/contrib/collation/build.xml
---- lucene2~/contrib/collation/build.xml 2009-08-19 20:22:41.000000000 +0200
-+++ lucene2/contrib/collation/build.xml 2009-08-20 11:16:40.000000000 +0200
-@@ -26,7 +26,7 @@
-
-
- <path id="additional.dependencies">
-- <fileset dir="lib" includes="icu4j-*.jar"/>
-+ <pathelement location="/usr/share/java/icu4j.jar"/>
- <pathelement location="../../build/contrib/misc/classes/java"/>
- </path>
-
Added: trunk/lucene2/debian/patches/50_fix-contrib-db-libs.diff
===================================================================
--- trunk/lucene2/debian/patches/50_fix-contrib-db-libs.diff (rev 0)
+++ trunk/lucene2/debian/patches/50_fix-contrib-db-libs.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_fix-contrib-db-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/db/bdb/build.xml lucene2/contrib/db/bdb/build.xml
+--- lucene2~/contrib/db/bdb/build.xml 2010-06-05 23:08:23.000000000 +0200
++++ lucene2/contrib/db/bdb/build.xml 2010-08-06 10:07:42.000000000 +0200
+@@ -21,13 +21,11 @@
+ Lucene Berkeley DB integration
+ </description>
+
+- <property name="db.version" value="4.7.25" />
+-
+ <property name="javac.source" value="1.5" />
+ <property name="javac.target" value="1.5" />
+
+ <path id="db.jar">
+- <pathelement location="lib/db-${db.version}.jar" />
++ <pathelement location="/usr/share/java/db.jar" />
+ </path>
+
+ <pathconvert property="project.classpath" targetos="unix" refid="db.jar" />
+@@ -51,12 +49,6 @@
+ </available>
+ </target>
+
+- <target name="get-db-jar" unless="db.jar.exists" if="build.this.contrib">
+- <mkdir dir="lib" />
+- <get src="http://downloads.osafoundation.org/db/db-${db.version}.jar"
+- dest="lib/db-${db.version}.jar" />
+- </target>
+-
+ <target name="sanity-load-lib" depends="compile-test" if="build.this.contrib">
+ <java classname="org.apache.lucene.store.db.SanityLoadLibrary"
+ classpathref="junit.classpath"
+@@ -83,7 +75,6 @@
+ <antcall target="contrib-build.test" inheritAll="true" inheritRefs="true" />
+ </target>
+
+- <target name="check-and-get-db-jar" depends="get-db-jar" />
+- <target name="init" depends="contrib-build.init,checkJAR,check-and-get-db-jar" />
++ <target name="init" depends="contrib-build.init,checkJAR" />
+
+ </project>
Property changes on: trunk/lucene2/debian/patches/50_fix-contrib-db-libs.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_fix-contrib-db-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/db/bdb/build.xml lucene2/contrib/db/bdb/build.xml
---- lucene2~/contrib/db/bdb/build.xml 2010-06-05 23:08:23.000000000 +0200
-+++ lucene2/contrib/db/bdb/build.xml 2010-08-06 10:07:42.000000000 +0200
-@@ -21,13 +21,11 @@
- Lucene Berkeley DB integration
- </description>
-
-- <property name="db.version" value="4.7.25" />
--
- <property name="javac.source" value="1.5" />
- <property name="javac.target" value="1.5" />
-
- <path id="db.jar">
-- <pathelement location="lib/db-${db.version}.jar" />
-+ <pathelement location="/usr/share/java/db.jar" />
- </path>
-
- <pathconvert property="project.classpath" targetos="unix" refid="db.jar" />
-@@ -51,12 +49,6 @@
- </available>
- </target>
-
-- <target name="get-db-jar" unless="db.jar.exists" if="build.this.contrib">
-- <mkdir dir="lib" />
-- <get src="http://downloads.osafoundation.org/db/db-${db.version}.jar"
-- dest="lib/db-${db.version}.jar" />
-- </target>
--
- <target name="sanity-load-lib" depends="compile-test" if="build.this.contrib">
- <java classname="org.apache.lucene.store.db.SanityLoadLibrary"
- classpathref="junit.classpath"
-@@ -83,7 +75,6 @@
- <antcall target="contrib-build.test" inheritAll="true" inheritRefs="true" />
- </target>
-
-- <target name="check-and-get-db-jar" depends="get-db-jar" />
-- <target name="init" depends="contrib-build.init,checkJAR,check-and-get-db-jar" />
-+ <target name="init" depends="contrib-build.init,checkJAR" />
-
- </project>
Added: trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.diff
===================================================================
--- trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.diff (rev 0)
+++ trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_fix-contrib-db-je-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/db/bdb-je/build.xml lucene2/contrib/db/bdb-je/build.xml
+--- lucene2~/contrib/db/bdb-je/build.xml 2010-06-05 23:08:23.000000000 +0200
++++ lucene2/contrib/db/bdb-je/build.xml 2010-08-06 10:15:30.000000000 +0200
+@@ -27,7 +27,7 @@
+ <property name="javac.target" value="1.5" />
+
+ <path id="je.jar">
+- <pathelement location="lib/je-${je.version}/lib/je-${je.version}.jar" />
++ <pathelement location="/usr/share/java/db-je.jar" />
+ </path>
+
+ <pathconvert property="project.classpath" targetos="unix" refid="je.jar" />
+@@ -51,17 +51,5 @@
+ </available>
+ </target>
+
+- <target name="get-je-jar" unless="je.jar.exists" if="build.this.contrib">
+- <mkdir dir="lib" />
+- <get src="http://download.oracle.com/berkeley-db/je-${je.version}.zip"
+- dest="lib/je-${je.version}.zip" />
+- <unzip src="lib/je-${je.version}.zip" dest="lib">
+- <patternset>
+- <include name="je-${je.version}/lib/je-${je.version}.jar" />
+- </patternset>
+- </unzip>
+- </target>
+-
+- <target name="check-and-get-je-jar" depends="get-je-jar" if="build.this.contrib" />
+- <target name="init" depends="contrib-build.init,checkJAR,check-and-get-je-jar" />
++ <target name="init" depends="contrib-build.init,checkJAR" />
+ </project>
Property changes on: trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 55_fix-contrib-db-je-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/db/bdb-je/build.xml lucene2/contrib/db/bdb-je/build.xml
---- lucene2~/contrib/db/bdb-je/build.xml 2010-06-05 23:08:23.000000000 +0200
-+++ lucene2/contrib/db/bdb-je/build.xml 2010-08-06 10:15:30.000000000 +0200
-@@ -27,7 +27,7 @@
- <property name="javac.target" value="1.5" />
-
- <path id="je.jar">
-- <pathelement location="lib/je-${je.version}/lib/je-${je.version}.jar" />
-+ <pathelement location="/usr/share/java/db-je.jar" />
- </path>
-
- <pathconvert property="project.classpath" targetos="unix" refid="je.jar" />
-@@ -51,17 +51,5 @@
- </available>
- </target>
-
-- <target name="get-je-jar" unless="je.jar.exists" if="build.this.contrib">
-- <mkdir dir="lib" />
-- <get src="http://download.oracle.com/berkeley-db/je-${je.version}.zip"
-- dest="lib/je-${je.version}.zip" />
-- <unzip src="lib/je-${je.version}.zip" dest="lib">
-- <patternset>
-- <include name="je-${je.version}/lib/je-${je.version}.jar" />
-- </patternset>
-- </unzip>
-- </target>
--
-- <target name="check-and-get-je-jar" depends="get-je-jar" if="build.this.contrib" />
-- <target name="init" depends="contrib-build.init,checkJAR,check-and-get-je-jar" />
-+ <target name="init" depends="contrib-build.init,checkJAR" />
- </project>
Added: trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.diff
===================================================================
--- trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.diff (rev 0)
+++ trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_fix-contrib-lucli-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Link contrib/lucli to the libraries from /usr/share/java instead of
+## DP: to the (removed) libraries from lib/
+
+ at DPATCH@
+diff -urNad trunk~/contrib/lucli/build.xml trunk/contrib/lucli/build.xml
+--- trunk~/contrib/lucli/build.xml 2007-06-04 06:02:20.000000000 +0200
++++ trunk/contrib/lucli/build.xml 2007-06-05 13:52:51.000000000 +0200
+@@ -25,7 +25,7 @@
+
+
+ <path id="additional.dependencies">
+- <pathelement location="lib/jline.jar"/>
++ <pathelement location="/usr/share/java/jline.jar"/>
+ </path>
+
+ <pathconvert property="project.classpath"
Property changes on: trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/60_fix-contrib-lucli-libs.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_fix-contrib-lucli-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link contrib/lucli to the libraries from /usr/share/java instead of
-## DP: to the (removed) libraries from lib/
-
- at DPATCH@
-diff -urNad trunk~/contrib/lucli/build.xml trunk/contrib/lucli/build.xml
---- trunk~/contrib/lucli/build.xml 2007-06-04 06:02:20.000000000 +0200
-+++ trunk/contrib/lucli/build.xml 2007-06-05 13:52:51.000000000 +0200
-@@ -25,7 +25,7 @@
-
-
- <path id="additional.dependencies">
-- <pathelement location="lib/jline.jar"/>
-+ <pathelement location="/usr/share/java/jline.jar"/>
- </path>
-
- <pathconvert property="project.classpath"
Added: trunk/lucene2/debian/patches/61_lucli-script.diff
===================================================================
--- trunk/lucene2/debian/patches/61_lucli-script.diff (rev 0)
+++ trunk/lucene2/debian/patches/61_lucli-script.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 61_lucli-script.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix the lucli run.sh script to use the jar files in the
+## DP: standard locations.
+
+ at DPATCH@
+diff -urNad lucene2~/contrib/lucli/run.sh lucene2/contrib/lucli/run.sh
+--- lucene2~/contrib/lucli/run.sh 2009-10-09 13:00:12.000000000 +0200
++++ lucene2/contrib/lucli/run.sh 2009-10-09 13:01:00.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/bin/sh
+
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+ # contributor license agreements. See the NOTICE file distributed with
+@@ -14,9 +15,8 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+-LUCLI=.
++LUCLI=/usr/share/java
+ LUCLI_MEMORY=128M
+-#JAVA_HOME=/home/dror/j2sdk1.4.1_03/
+-CLASSPATH=${CLASSPATH}:$LUCLI/lib/jline.jar:$LUCLI/lib/lucene.jar:$LUCLI/dist/lucli-dev.jar
++CLASSPATH=${CLASSPATH}:$LUCLI/jline.jar:$LUCLI/lucene-core.jar:$LUCLI/lucene-lucli.jar
+ export CLASSPATH
+-$JAVA_HOME/bin/java -Xmx${LUCLI_MEMORY} lucli.Lucli
++java -Xmx${LUCLI_MEMORY} lucli.Lucli
Property changes on: trunk/lucene2/debian/patches/61_lucli-script.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/61_lucli-script.dpatch
===================================================================
--- trunk/lucene2/debian/patches/61_lucli-script.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/61_lucli-script.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 61_lucli-script.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the lucli run.sh script to use the jar files in the
-## DP: standard locations.
-
- at DPATCH@
-diff -urNad lucene2~/contrib/lucli/run.sh lucene2/contrib/lucli/run.sh
---- lucene2~/contrib/lucli/run.sh 2009-10-09 13:00:12.000000000 +0200
-+++ lucene2/contrib/lucli/run.sh 2009-10-09 13:01:00.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/bin/sh
-
- # Licensed to the Apache Software Foundation (ASF) under one or more
- # contributor license agreements. See the NOTICE file distributed with
-@@ -14,9 +15,8 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
-
--LUCLI=.
-+LUCLI=/usr/share/java
- LUCLI_MEMORY=128M
--#JAVA_HOME=/home/dror/j2sdk1.4.1_03/
--CLASSPATH=${CLASSPATH}:$LUCLI/lib/jline.jar:$LUCLI/lib/lucene.jar:$LUCLI/dist/lucli-dev.jar
-+CLASSPATH=${CLASSPATH}:$LUCLI/jline.jar:$LUCLI/lucene-core.jar:$LUCLI/lucene-lucli.jar
- export CLASSPATH
--$JAVA_HOME/bin/java -Xmx${LUCLI_MEMORY} lucli.Lucli
-+java -Xmx${LUCLI_MEMORY} lucli.Lucli
Added: trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.diff
===================================================================
--- trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.diff (rev 0)
+++ trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_fix-contrib-regex-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Link contrib/regex to the libraries from /usr/share/java instead of
+## DP: to the (removed) libraries from lib/
+
+ at DPATCH@
+diff -urNad trunk~/contrib/regex/build.xml trunk/contrib/regex/build.xml
+--- trunk~/contrib/regex/build.xml 2007-06-04 06:02:22.000000000 +0200
++++ trunk/contrib/regex/build.xml 2007-06-05 13:58:54.000000000 +0200
+@@ -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"
Property changes on: trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/70_fix-contrib-regex-libs.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_fix-contrib-regex-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link contrib/regex to the libraries from /usr/share/java instead of
-## DP: to the (removed) libraries from lib/
-
- at DPATCH@
-diff -urNad trunk~/contrib/regex/build.xml trunk/contrib/regex/build.xml
---- trunk~/contrib/regex/build.xml 2007-06-04 06:02:22.000000000 +0200
-+++ trunk/contrib/regex/build.xml 2007-06-05 13:58:54.000000000 +0200
-@@ -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"
Added: trunk/lucene2/debian/patches/80_prevent-downloading-data-files.diff
===================================================================
--- trunk/lucene2/debian/patches/80_prevent-downloading-data-files.diff (rev 0)
+++ trunk/lucene2/debian/patches/80_prevent-downloading-data-files.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_prevent-downloading-data-files.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/benchmark/build.xml lucene2/contrib/benchmark/build.xml
+--- lucene2~/contrib/benchmark/build.xml 2010-08-06 10:17:10.000000000 +0200
++++ lucene2/contrib/benchmark/build.xml 2010-08-06 10:31:07.000000000 +0200
+@@ -171,8 +171,8 @@
+ <target name="init" depends="contrib-build.init,compile-demo,compile-memory,compile-highlighter,compile-vector-highlighter,check-files"/>
+
+ <!-- make sure online collections (reuters) are first downloaded -->
+- <target name="test" depends="init,get-files">
+- <antcall target="contrib-build.test" inheritRefs="true" />
++ <!-- test disabled, cannot download reuters and news data in automated build environments -->
++ <target name="test" depends="init">
+ </target>
+
+ </project>
Property changes on: trunk/lucene2/debian/patches/80_prevent-downloading-data-files.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch
===================================================================
--- trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_prevent-downloading-data-files.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/contrib/benchmark/build.xml lucene2/contrib/benchmark/build.xml
---- lucene2~/contrib/benchmark/build.xml 2010-08-06 10:17:10.000000000 +0200
-+++ lucene2/contrib/benchmark/build.xml 2010-08-06 10:31:07.000000000 +0200
-@@ -171,8 +171,8 @@
- <target name="init" depends="contrib-build.init,compile-demo,compile-memory,compile-highlighter,compile-vector-highlighter,check-files"/>
-
- <!-- make sure online collections (reuters) are first downloaded -->
-- <target name="test" depends="init,get-files">
-- <antcall target="contrib-build.test" inheritRefs="true" />
-+ <!-- test disabled, cannot download reuters and news data in automated build environments -->
-+ <target name="test" depends="init">
- </target>
-
- </project>
Added: trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.diff
===================================================================
--- trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.diff (rev 0)
+++ trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 81_disable-test-tag-backcompat-tests.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- a/build.xml
++++ b/build.xml
+@@ -90,8 +90,8 @@
+ <target name="test-core" depends="common.test"
+ description="Runs unit tests for the core Lucene code"
+ />
+- <target name="test" depends="test-core, test-contrib, test-tag"
+- description="Runs all unit tests (core, contrib and back-compat)"
++ <target name="test" depends="test-core, test-contrib"
++ description="Runs all unit tests (core and contrib)"
+ />
+
+ <property name="tag" value="${compatibility.tag}"/>
+@@ -110,50 +110,6 @@
+ <pathelement path="${java.class.path}"/>
+ </path>
+
+- <target name="download-tag"
+- description="Downloads a previous Lucene version. Specify tag version like this: -Dtag=lucene_2_4_back_compat_tests_20090127">
+- <sequential>
+- <mkdir dir="${tags.dir}/${tag}"/>
+- <exec dir="${tags.dir}/${tag}" executable="${svn.exe}"
+- failifexecutionfails="false">
+- <arg line="checkout http://svn.apache.org/repos/asf/lucene/java/tags/${tag}/src/"/>
+- </exec>
+- </sequential>
+- </target>
+-
+- <target name="test-tag" depends="download-tag, compile-core, compile-demo, jar-core"
+- description="Runs tests of a previous Lucene version. Specify tag version like this: -Dtag=branches/lucene_2_4_back_compat_tests">
+- <sequential>
+- <available property="tag.available" file="${tags.dir}/${tag}/src/test" />
+-
+- <fail unless="tag.available">
+- Specified tag '${tag}' could not be found in directory '${tags.dir}/${tag}'.
+- </fail>
+- <mkdir dir="${build.dir}/${tag}"/>
+-
+- <!-- first compile tag classes -->
+- <compile
+- srcdir="${tags.dir}/${tag}/src/java"
+- destdir="${build.dir}/${tag}/classes/java">
+- <classpath refid="tag.classpath"/>
+- </compile>
+-
+- <!-- compile jar for tag -->
+- <jarify basedir="${build.dir}/${tag}/classes/java"
+- destfile="${build.dir}/${tag}/${tag}.jar" />
+-
+- <!-- compile tag tests against tag jar -->
+- <compile-test-macro srcdir="${tags.dir}/${tag}/src/test" destdir="${build.dir}/${tag}/classes/test"
+- test.classpath="tag.test.classpath"/>
+-
+- <!-- run tag tests against trunk jar -->
+- <test-macro dataDir="${tags.dir}/${tag}/src/test"
+- tempDir="${build.dir}/${tag}"
+- junit.classpath="tag.junit.classpath"/>
+- </sequential>
+- </target>
+-
+-
+ <target name="clean-tags"
+ description="Removes contents of the tags directory">
+ <delete dir="${tags.dir}"/>
Deleted: trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.dpatch
===================================================================
--- trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/81_disable-test-tag-backcompat-tests.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,72 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 81_disable-test-tag-backcompat-tests.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad lucene2~/build.xml lucene2/build.xml
---- lucene2~/build.xml 2009-09-18 01:03:43.000000000 +0200
-+++ lucene2/build.xml 2009-11-05 10:43:38.000000000 +0100
-@@ -80,8 +80,8 @@
- <target name="test-core" depends="common.test"
- description="Runs unit tests for the core Lucene code"
- />
-- <target name="test" depends="test-core, test-contrib, test-tag"
-- description="Runs all unit tests (core, contrib and back-compat)"
-+ <target name="test" depends="test-core, test-contrib"
-+ description="Runs all unit tests (core and contrib)"
- />
-
- <property name="tag" value="${compatibility.tag}"/>
-@@ -100,50 +100,6 @@
- <pathelement path="${java.class.path}"/>
- </path>
-
-- <target name="download-tag"
-- description="Downloads a previous Lucene version. Specify tag version like this: -Dtag=lucene_2_4_back_compat_tests_20090127">
-- <sequential>
-- <mkdir dir="${tags.dir}/${tag}"/>
-- <exec dir="${tags.dir}/${tag}" executable="${svn.exe}"
-- failifexecutionfails="false">
-- <arg line="checkout http://svn.apache.org/repos/asf/lucene/java/tags/${tag}/src/"/>
-- </exec>
-- </sequential>
-- </target>
--
-- <target name="test-tag" depends="download-tag, compile-core, compile-demo, jar-core"
-- description="Runs tests of a previous Lucene version. Specify tag version like this: -Dtag=branches/lucene_2_4_back_compat_tests">
-- <sequential>
-- <available property="tag.available" file="${tags.dir}/${tag}/src/test" />
--
-- <fail unless="tag.available">
-- Specified tag '${tag}' could not be found in directory '${tags.dir}/${tag}'.
-- </fail>
-- <mkdir dir="${build.dir}/${tag}"/>
--
-- <!-- first compile tag classes -->
-- <compile
-- srcdir="${tags.dir}/${tag}/src/java"
-- destdir="${build.dir}/${tag}/classes/java">
-- <classpath refid="tag.classpath"/>
-- </compile>
--
-- <!-- compile jar for tag -->
-- <jarify basedir="${build.dir}/${tag}/classes/java"
-- destfile="${build.dir}/${tag}/${tag}.jar" />
--
-- <!-- compile tag tests against tag jar -->
-- <compile-test-macro srcdir="${tags.dir}/${tag}/src/test" destdir="${build.dir}/${tag}/classes/test"
-- test.classpath="tag.test.classpath"/>
--
-- <!-- run tag tests against trunk jar -->
-- <test-macro dataDir="${tags.dir}/${tag}/src/test"
-- tempDir="${build.dir}/${tag}"
-- junit.classpath="tag.junit.classpath"/>
-- </sequential>
-- </target>
--
--
- <target name="clean-tags"
- description="Removes contents of the tags directory">
- <delete dir="${tags.dir}"/>
Added: trunk/lucene2/debian/patches/82_disable-svnversion-calls.diff
===================================================================
--- trunk/lucene2/debian/patches/82_disable-svnversion-calls.diff (rev 0)
+++ trunk/lucene2/debian/patches/82_disable-svnversion-calls.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 82_disable-svnversion-calls.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- a/common-build.xml
++++ b/common-build.xml
+@@ -101,15 +101,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" />
+-
+ <available property="build-1-5-contrib" classname="java.lang.StringBuilder" />
+
+ <property name="clover.db.dir" location="${common.dir}/build/test/clover/db"/>
+@@ -316,7 +307,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"
+@@ -351,12 +342,6 @@
+ <element name="manifest-attributes" optional="yes"/>
+ <element name="metainf-includes" optional="yes"/>
+ <sequential>
+- <!-- If possible, include the svnversion -->
+- <exec dir="." executable="${svnversion.exe}"
+- outputproperty="svnversion" failifexecutionfails="false">
+- <arg line="."/>
+- </exec>
+-
+ <build-manifest/>
+ <if>
+ <isset property="OSGi.requirebundle"/>
Deleted: trunk/lucene2/debian/patches/82_disable-svnversion-calls.dpatch
===================================================================
--- trunk/lucene2/debian/patches/82_disable-svnversion-calls.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/82_disable-svnversion-calls.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 82_disable-svnversion-calls.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/common-build.xml lucene2/common-build.xml
---- lucene2~/common-build.xml 2010-08-06 11:29:27.000000000 +0200
-+++ lucene2/common-build.xml 2010-08-06 11:30:19.000000000 +0200
-@@ -99,15 +99,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" />
--
- <available property="build-1-5-contrib" classname="java.lang.StringBuilder" />
-
- <property name="clover.db.dir" location="${common.dir}/build/test/clover/db"/>
-@@ -305,7 +296,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"
-@@ -345,12 +336,6 @@
- <element name="manifest-attributes" optional="yes"/>
- <element name="metainf-includes" optional="yes"/>
- <sequential>
-- <!-- If possible, include the svnversion -->
-- <exec dir="." executable="${svnversion.exe}"
-- outputproperty="svnversion" failifexecutionfails="false">
-- <arg line="."/>
-- </exec>
--
- <build-manifest/>
-
- <jar
Added: trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.diff
===================================================================
--- trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.diff (rev 0)
+++ trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.diff 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 83_fix-java-IPv4-networking.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- a/common-build.xml
++++ b/common-build.xml
+@@ -56,7 +56,7 @@
+ </path>
+
+ <!-- default arguments to pass to JVM executing tests -->
+- <property name="args" value=""/>
++ <property name="args" value="-Djava.net.preferIPv4Stack=true"/>
+
+ <property name="javac.deprecation" value="off"/>
+ <property name="javac.debug" value="on"/>
Deleted: trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.dpatch
===================================================================
--- trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 83_fix-java-IPv4-networking.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
---- lucene2-2.9.1+ds1.orig/common-build.xml
-+++ lucene2-2.9.1+ds1/common-build.xml
-@@ -54,7 +54,7 @@
- </path>
-
- <!-- default arguments to pass to JVM executing tests -->
-- <property name="args" value=""/>
-+ <property name="args" value="-Djava.net.preferIPv4Stack=true"/>
-
- <property name="javac.deprecation" value="off"/>
- <property name="javac.debug" value="on"/>
Deleted: trunk/lucene2/debian/patches/99debug_print-unittest-results.dpatch
===================================================================
--- trunk/lucene2/debian/patches/99debug_print-unittest-results.dpatch 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/patches/99debug_print-unittest-results.dpatch 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99debug_print-unittest-results-final.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad lucene2~/build.xml lucene2/build.xml
---- lucene2~/build.xml 2010-01-25 15:04:52.000000000 +0100
-+++ lucene2/build.xml 2010-01-25 15:28:13.000000000 +0100
-@@ -88,8 +88,11 @@
- <!-- ================================================================== -->
-
- <target name="test-core" depends="common.test"
-- description="Runs unit tests for the core Lucene code"
-- />
-+ description="Runs unit tests for the core Lucene code">
-+ <exec executable="/bin/cat">
-+ <arg path="${junit.output.dir}/TEST-org.apache.lucene.index.TestIndexReaderReopen.xml" />
-+ </exec>
-+ </target>
- <target name="test" depends="test-core, test-contrib"
- description="Runs all unit tests (core and contrib)"
- />
Added: trunk/lucene2/debian/patches/series
===================================================================
--- trunk/lucene2/debian/patches/series (rev 0)
+++ trunk/lucene2/debian/patches/series 2014-07-22 16:51:37 UTC (rev 18283)
@@ -0,0 +1,19 @@
+05_add-osgi-metadata-in-manifests.diff
+10_fix-javacc-locations.diff
+11_fix-javacc-generated-files.diff
+12_fix-buildd-failure-in-TestTimeLimitingCollector.diff
+20_fix-java-compiler-version.diff
+30_fix-contrib-ant-libs.diff
+31_fix-contrib-ant-test-wrong-encoding.diff
+40_fix-contrib-benchmark-libs.diff
+45_fix-contrib-collation-libs.diff
+50_fix-contrib-db-libs.diff
+55_fix-contrib-db-je-libs.diff
+60_fix-contrib-lucli-libs.diff
+61_lucli-script.diff
+70_fix-contrib-regex-libs.diff
+80_prevent-downloading-data-files.diff
+81_disable-test-tag-backcompat-tests.diff
+82_disable-svnversion-calls.diff
+83_fix-java-IPv4-networking.diff
+#01_remove_all_jarfiles.diff
Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/rules 2014-07-22 16:51:37 UTC (rev 18283)
@@ -2,7 +2,6 @@
# -*- makefile -*-
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/ant.mk
# Uncomment this to turn on verbose mode.
Modified: trunk/lucene2/debian/source/format
===================================================================
--- trunk/lucene2/debian/source/format 2014-07-19 08:23:44 UTC (rev 18282)
+++ trunk/lucene2/debian/source/format 2014-07-22 16:51:37 UTC (rev 18283)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the pkg-java-commits
mailing list