[lucene4.10] 02/06: Ported changes made in lucene4 1:4.6.1+dfsg-3

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository lucene4.10.

commit 294384b6157bdbc2dd15722f1254e1db332c5cf5
Author: Hilko Bengen <bengen at debian.org>
Date:   Sun Mar 29 16:00:00 2015 +0200

    Ported changes made in lucene4 1:4.6.1+dfsg-3
---
 debian/control                                     |  4 ++-
 ...4-disable-ivy-retrieve-and-set-javacchome.patch | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  1 +
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 6ce0683..bf21e4e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,11 @@
 Source: lucene4.10
 Section: java
 Priority: extra
-Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Hilko Bengen <bengen at debian.org>
 Build-Depends: debhelper (>= 9~), default-jdk, maven-debian-helper,
+ javacc,
+ libjavacc-maven-plugin-java,
 Build-Depends-Indep: ant, ivy,
  antlr3,
  libasm4-java,
diff --git a/debian/patches/0004-disable-ivy-retrieve-and-set-javacchome.patch b/debian/patches/0004-disable-ivy-retrieve-and-set-javacchome.patch
new file mode 100644
index 0000000..55a2bc3
--- /dev/null
+++ b/debian/patches/0004-disable-ivy-retrieve-and-set-javacchome.patch
@@ -0,0 +1,34 @@
+From: tony mancill <tmancill at debian.org>
+Date: Sat, 11 Jan 2014 08:48:00 -0800
+Subject: disable ivy:retrieve and set javacchome
+
+--
+---
+ queryparser/build.xml | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/queryparser/build.xml b/queryparser/build.xml
+index 00f805e..a4252df 100644
+--- a/queryparser/build.xml
++++ b/queryparser/build.xml
+@@ -142,9 +142,11 @@ import org.apache.lucene.queryparser.flexible.core.messages.*;"
+ 
+   <target name="resolve-javacc" xmlns:ivy="antlib:org.apache.ivy.ant">
+     <!-- setup a "fake" JavaCC distribution folder in ${build.dir} to make JavaCC ANT task happy: -->
++    <!--
+     <ivy:retrieve organisation="net.java.dev.javacc" module="javacc" revision="5.0"
+       inline="true" conf="default" transitive="false" type="jar" sync="true"
+       pattern="${build.dir}/javacc/bin/lib/[artifact].[ext]"/>
++    -->
+   </target>
+ 
+   <macrodef name="invoke-javacc">
+@@ -160,7 +162,7 @@ import org.apache.lucene.queryparser.flexible.core.messages.*;"
+       <javacc
+           target="@{target}"
+           outputDirectory="@{outputDir}"
+-          javacchome="${build.dir}/javacc"
++          javacchome="/usr/share/java"
+           jdkversion="${javac.source}"
+       />
+       <fixcrlf srcdir="@{outputDir}" includes="*.java" encoding="UTF-8">
diff --git a/debian/patches/series b/debian/patches/series
index 380503f..03afcea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch
 0002-Use-javax.servlet-servlet-api-directly.patch
 0003-Adjust-build-dep-versions-as-needed.patch
+0004-disable-ivy-retrieve-and-set-javacchome.patch
diff --git a/debian/rules b/debian/rules
index 26bb93a..7112552 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ export CLASSPATH=/usr/share/java/ivy.jar
 	dh $@ --with-buildsystem=ant
 
 override_dh_auto_build:
+	ant -buildfile queryparser/build.xml regenerate
 	dh_auto_build -- -Dversion=$(VERSION) jar
 
 # TODO: dependency test-framework: com.carrotsearch.randomizedtesting#junit4-ant

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene4.10.git