[jasperreports] 02/03: Exclude lucene2 and lucene3 from the classpath

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository jasperreports.

commit 654b1935a67e0773f15979c830ed885accdb3e8c
Author: Markus Koschany <apo at gambaru.de>
Date:   Tue Oct 20 14:58:22 2015 +0200

    Exclude lucene2 and lucene3 from the classpath
    
    to prevent a FTBFS when jasperreports is not built in a clean environment.
---
 debian/patches/build.patch | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 7b9d027..84b225e 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -10,14 +10,14 @@ javaflow related build issue and include the required class files.
 
 Forwarded: not-needed
 ---
- build.xml | 25 ++++++++++++++++++++-----
- 1 file changed, 20 insertions(+), 5 deletions(-)
+ build.xml | 27 ++++++++++++++++++++++-----
+ 1 file changed, 22 insertions(+), 5 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index cfa2166..9eb4b87 100644
+index cfa2166..dcc6057 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -6,15 +6,17 @@
+@@ -6,15 +6,19 @@
  
  	<target name="compile" description="Compiles the java source files of the library.">
  		<mkdir dir="./build/classes"/> 
@@ -29,6 +29,8 @@ index cfa2166..9eb4b87 100644
 -				<fileset dir="./lib">
 +                <fileset dir="/usr/share/java/">
  					<include name="**/*.jar"/>
++					<exclude name="**/lucene3-*.jar"/>
++					<exclude name="**/lucene2-*.jar"/>
  				</fileset>
  			</classpath>
  			<src path="./src"/>
@@ -37,7 +39,7 @@ index cfa2166..9eb4b87 100644
  			<compilerarg value="-Xlint:unchecked"/>
  			<compilerarg value="-Xlint:-options"/>
  		</javac>
-@@ -64,12 +66,12 @@
+@@ -64,12 +68,12 @@
  		</jar>
  	</target>
  	
@@ -52,7 +54,7 @@ index cfa2166..9eb4b87 100644
  					<include name="**/*.jar"/>
  				</fileset>
  				<pathelement location="./build/classes"/>
-@@ -95,6 +97,19 @@
+@@ -95,6 +99,19 @@
  			<include name="net/sf/jasperreports/engine/fill/JRSubreportRunnable.class"/>
  			<include name="net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.class"/>
  			<include name="net/sf/jasperreports/engine/fill/FillerSubreportParent.class"/>
@@ -72,7 +74,7 @@ index cfa2166..9eb4b87 100644
  		</javaflow>
  
  		<mkdir dir="./dist"/> 
-@@ -278,6 +293,6 @@
+@@ -278,6 +295,6 @@
  		</copy>
  	</target>
  	

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