2 new patches from philip (missing dep in d/control, further cleanup in build.xml)
[debian/jabref.git] / debian / patches / 02_libs.patch
1 Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
2 Author: Philip Rinn <rinni@gmx.net>
3 Description: Use debian libraries and disable unnecesary unjarlib target,
4 Index: 2.5/build.xml
5 ===================================================================
6 --- 2.5.orig/build.xml  2009-08-12 21:47:37.000000000 +0200
7 +++ 2.5/build.xml       2009-08-12 21:54:25.000000000 +0200
8 @@ -85,7 +85,7 @@
9         <property name="help.dir" value="${src.dir}/help" />
10         <property name="extensions.dir" value="${src.dir}/extensions" />
11         <property name="layout.dir" value="${src.dir}/resource/layout" />
12 -       <property name="lib.dir" value="lib" />
13 +       <property name="lib.dir" value="/usr/share/java" />
14         <property name="tests.dir" value="${src.dir}/tests" />
15  
16         <property name="nsis.executable" value="makensis.exe"/>
17 @@ -107,22 +107,21 @@
18  
19         <fileset id="jarsFileset" dir="${lib.dir}">
20                 <include name="antlr.jar" />
21 -               <include name="antlr-3.0b5.jar" />
22 -               <include name="looks-2.2.0.jar" />
23 -               <include name="forms-1.1.0.jar" />
24 +               <include name="antlr3.jar" />
25 +               <include name="looks.jar" />
26 +               <include name="forms.jar" />
27                 <include name="spin.jar" />
28 -               <include name="glazedlists-1.7.0_java15.jar" />
29 +               <include name="glazedlists.jar" />
30                 <include name="microba.jar" />
31 -               <include name="PDFBox-0.7.3-dev-reduced.jar" />
32 -               <include name="JempBox-0.2.0.jar" />
33 -               <include name="zoom-java.jar" />
34 -       <include name="mysql-connector-java-5.0.7-bin.jar" />
35 +               <include name="pdfbox.jar" />
36 +               <include name="jempbox.jar" />
37 +       <include name="mysql-connector-java.jar" />
38          <!--<include name="substance-4.1.jar" />-->
39          <!-- Plugin runtime dependencies -->
40 -               <include name="plugin/JPFCodeGenerator-rt.jar" />
41 -               <include name="plugin/jpf.jar" />
42 -               <include name="plugin/jpf-boot.jar" />
43 -               <include name="plugin/commons-logging.jar" />
44 +               <include name="JPFCodeGenerator-rt.jar" />
45 +               <include name="jpf.jar" />
46 +               <include name="jpf-boot.jar" />
47 +               <include name="commons-logging.jar" />
48         </fileset>
49  
50         <!-- Build classpath -->
51 @@ -134,10 +133,10 @@
52  
53         <!-- Classpath for running the code generator -->
54         <path id="codegenerator">
55 -               <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
56 -               <pathelement location="${lib.dir}/plugin/jpf.jar" />
57 -               <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
58 -               <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
59 +               <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
60 +               <pathelement location="${lib.dir}/jpf.jar" />
61 +               <pathelement location="${lib.dir}/jpf-boot.jar" />
62 +               <pathelement location="${lib.dir}/velocity.jar" />
63         </path>
64  
65         <!-- Classpath for tests -->
66 @@ -217,7 +216,7 @@
67         </target>
68  
69         <!-- Jars up project -->
70 -       <target name="jars" depends="build, unjarlib">
71 +       <target name="jars" depends="build">
72                 <mkdir dir="${build.lib}" />
73                 <mkdir dir="${build.tmp}" />
74                 <jar destfile="${build.lib}/${build.jar}">
75 @@ -612,6 +611,6 @@
76                 </jalopy>
77         </target>
78  
79 -       <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
80 +<!--   <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" /> -->
81  
82  </project>