[libjchart2d-java] 03/05: Update build.patch

[Markus Koschany]

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

apo pushed a commit to branch master
in repository libjchart2d-java.

commit dcc7d132d125ea91ed20ddb6bfed199eea2d90c9
Author: Markus Koschany <apo at debian.org>
Date:   Sat Mar 17 19:29:12 2018 +0100

    Update build.patch
---
 debian/patches/build.patch | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index c31ef5f..b53df2d 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -3,11 +3,11 @@ Date: Sat, 11 Oct 2014 14:18:26 +0200
 Subject: build
 
 ---
- jchart2d/build.xml | 20 +++++++++++---------
- 1 file changed, 11 insertions(+), 9 deletions(-)
+ jchart2d/build.xml | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
 
 diff --git a/jchart2d/build.xml b/jchart2d/build.xml
-index deda1b8..163bfc4 100644
+index deda1b8..66d38e3 100644
 --- a/jchart2d/build.xml
 +++ b/jchart2d/build.xml
 @@ -1,14 +1,15 @@
@@ -37,21 +37,23 @@ index deda1b8..163bfc4 100644
  
  	<!-- General paths & filesets. -->
  
-@@ -139,9 +140,10 @@
+@@ -137,12 +138,9 @@
+           Tun this off is more jars have deps that may not be ignored.
+          -->
  		<proguard obfuscate="false" shrink="true" overloadaggressively="false" warn="true" verbose="true" ignorewarnings="true" printmapping="true" allowaccessmodification="false" optimize="false">
- 			<libraryjar>
- 				<pathelement path="${java.home}/lib/rt.jar" />
+-			<libraryjar>
+-				<pathelement path="${java.home}/lib/rt.jar" />
 -				<fileset dir="${libdir}">
 -					<include name="*.jar" />
 -				</fileset>
-+                <fileset dir="${libdir}">
-+                    <include name="jide-oss.jar" />
-+                    <include name="xmlgraphics-commons.jar" />
-+                </fileset>
- 			</libraryjar>
+-			</libraryjar>
++            <libraryjar file="/usr/share/java/jide-oss.jar" />
++            <libraryjar file="/usr/share/java/xmlgraphics-commons.jar" />
++            <libraryjar dir="${java.home}/jmods" />
  			<!--
                 caution: The name attribut value has to be the same expression
-@@ -290,7 +292,7 @@
+                        as the  destfile of the makejar- target [depend].
+@@ -290,7 +288,7 @@
  	<target name="javadoc" depends="delete.doc">
  		<delete dir="${basedir}/doc/docs/javadoc"/>
  		<mkdir dir="${basedir}/doc/docs/javadoc" />
@@ -60,7 +62,7 @@ index deda1b8..163bfc4 100644
  			<classpath refid="classpath" />
  			<bottom>
  				<![CDATA[<i>Copyright © 2001 - 2010 <a href="http://www.opensource.org/licenses/lgpl-license.php" target="_blank">LGPL</a>, All Rights Footloose.</i>]]></bottom>
-@@ -308,7 +310,7 @@
+@@ -308,7 +306,7 @@
  </target>
  
  <!-- remove all resources in builddir and the current jar file-->
@@ -69,10 +71,10 @@ index deda1b8..163bfc4 100644
  	<delete verbose="true" failonerror="true">
  		<fileset dir="${builddir}" />
  		<file file="${outjar}" />
-@@ -362,5 +364,5 @@
+@@ -362,5 +360,5 @@
  		<arg line="-classpath ${basedir}/ext/build/jipViewer.jar com.tivo.jipviewer.JipViewer profiler.xml" />
  	</exec>
  </target>
 -
-+<target name="debian" depends="makejarBinary, javadoc"></target>
++<target name="debian" depends="makejarFat, javadoc"></target>
  </project>

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