[lombok-ast] 06/08: point ivyplusplus to /usr/share/java for jars

[Hans-Christoph Steiner]

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

eighthave pushed a commit to branch master
in repository lombok-ast.

commit c58a5f8c57c642665d3cc271ebf03f00b5a377cf
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Fri Dec 18 10:10:21 2015 +0100

    point ivyplusplus to /usr/share/java for jars
---
 .../patches/remove_dependency_on_ensure-ipp.patch  | 28 +++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/debian/patches/remove_dependency_on_ensure-ipp.patch b/debian/patches/remove_dependency_on_ensure-ipp.patch
index dd13b32..73c30f0 100644
--- a/debian/patches/remove_dependency_on_ensure-ipp.patch
+++ b/debian/patches/remove_dependency_on_ensure-ipp.patch
@@ -1,17 +1,29 @@
-Index: lombok-ast-0.2.3/build.xml
-===================================================================
---- lombok-ast-0.2.3.orig/build.xml
-+++ lombok-ast-0.2.3/build.xml
-@@ -65,7 +65,7 @@
+--- a/build.xml
++++ b/build.xml
+@@ -43,8 +43,11 @@
+ 	<target name="ensure-ipp" depends="load-ipp, redownload-ipp" />
+ 	
+ 	<path id="build.path">
+-		<fileset dir="lib/build">
+-			<include name="*.jar" />
++		<fileset dir="/usr/share/java">
++			<include name="ecj.jar" />
++			<include name="lombok.jar" />
++			<include name="parboiled-core.jar" />
++			<include name="spi.jar" />
+ 		</fileset>
+ 	</path>
+ 	
+@@ -65,7 +68,7 @@
  		<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
  	</target>
  	
 -	<target name="version" depends="ensure-ipp" description="Shows the version number.">
 +	<target name="version" description="Shows the version number.">
  		<mkdir dir="build/lombok.ast" />
- 		<javac destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" />
+ 		<ivy:compile destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" />
  		<java
-@@ -73,7 +73,6 @@
+@@ -73,7 +76,6 @@
  			classpath="build/lombok.ast"
  			failonerror="true"
  			output="build/version.txt" />
@@ -19,7 +31,7 @@ Index: lombok-ast-0.2.3/build.xml
  		<echo level="info">Lombok ast version: ${lombok.ast.version}</echo>
  	</target>
  	
-@@ -200,7 +199,7 @@
+@@ -200,7 +202,7 @@
  		<ivy:show-html file="build/cobertura/index.html" />
  	</target>
  		

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