Package: king / 2.21.120420+dfsg-1

use_debian_packaged_jars.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
Author: Andreas Tille <tille@debian.org>
Description: Use Debian packaged itext.jar and jogl.jar

--- king-2.21.120420.orig/king/build.xml
+++ king-2.21.120420/king/build.xml
@@ -68,7 +68,7 @@
     <ant antfile="../driftwood/build.xml" inheritAll="false" target="compile">
         <!-- inherited properties go here -->
     </ant>
-    <copy file="../lib/iText/itext-1.02b.jar" tofile="${basedir}/itext.jar" failonerror="false"/>
+    <copy file="/usr/share/java/itext.jar" tofile="${basedir}/itext.jar" failonerror="false"/>
     <mkdir dir="${build}"/>
     <javac srcdir="${src}" destdir="${build}" debug="on" debuglevel="lines,source" target="1.5" source="1.5">
          <include name="**/*.java"/>
@@ -102,7 +102,7 @@
          <classpath>
             <pathelement location="${build}"/>
             <pathelement location="../driftwood/build"/>
-            <pathelement location="../lib/jogl/jogl.jar"/>
+            <pathelement location="/usr/share/java/jogl.jar"/>
          </classpath>
     </javac>
 </target>
@@ -125,8 +125,8 @@
         <zipfileset dir="../extratools/dist/" includes="extratools/"/>
         <zipfileset dir="../molikin/dist/" includes="molikin/"/> 
         <zipfileset dir="../lib/" prefix="lib/">
-            <include name="iText/*.jar"/>
-            <include name="jogl/*.jar"/>
+            <include name="/usr/share/java/itext.jar"/>
+            <include name="/usr/share/java/jogl.jar"/>
         </zipfileset>
     </zip>
     <zip basedir="${dist}"
@@ -164,7 +164,7 @@
     <mkdir dir="${dist}/javadocs"/>
     <javadoc packagenames="driftwood.*,Jama.*,king.*"
         sourcepath="src:../driftwood/src"
-        classpath="../lib:../lib/iText/itext-1.02b.jar:../lib/jogl/jogl.jar"
+        classpath="../lib:/usr/share/java/itext.jar:/usr/share/java/jogl.jar"
         destdir="${dist}/javadocs" access="protected" source="1.5"
         breakiterator="true" noqualifier="all"
         version="true" use="true" author="true"
--- king-2.21.120420.orig/chiropraxis/build.xml
+++ king-2.21.120420/chiropraxis/build.xml
@@ -49,7 +49,7 @@
     <ant antfile="../molikin/build.xml" inheritAll="false" target="compile">
         <!-- inherited properties go here -->
     </ant>
-    <copy file="../lib/iText/iText-2.1.3.jar" tofile="${basedir}/itext.jar" failonerror="false"/>
+    <copy file="/usr/share/java/itext.jar" tofile="${basedir}/itext.jar" failonerror="false"/>
     <mkdir dir="${build}"/>
     <javac srcdir="${src}"
            destdir="${build}"