f07376d0f45f2c0599d28446ea836e15b7a23d19
[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 --- a/build.xml
5 +++ b/build.xml
6 @@ -85,7 +85,7 @@
7         <property name="help.dir" value="${src.dir}/help" />
8         <property name="extensions.dir" value="${src.dir}/extensions" />
9         <property name="layout.dir" value="${src.dir}/resource/layout" />
10 -       <property name="lib.dir" value="lib" />
11 +       <property name="lib.dir" value="/usr/share/java" />
12         <property name="tests.dir" value="${src.dir}/tests" />
13  
14         <property name="nsis.executable" value="makensis.exe"/>
15 @@ -107,22 +107,21 @@
16  
17         <fileset id="jarsFileset" dir="${lib.dir}">
18                 <include name="antlr.jar" />
19 -               <include name="antlr-3.0b5.jar" />
20 -               <include name="looks-2.2.0.jar" />
21 -               <include name="forms-1.1.0.jar" />
22 +               <include name="antlr3.jar" />
23 +               <include name="looks.jar" />
24 +               <include name="forms.jar" />
25                 <include name="spin.jar" />
26 -               <include name="glazedlists-1.7.0_java15.jar" />
27 +               <include name="glazedlists.jar" />
28                 <include name="microba.jar" />
29 -               <include name="PDFBox-0.7.3-dev-reduced.jar" />
30 -               <include name="JempBox-0.2.0.jar" />
31 -               <include name="zoom-java.jar" />
32 -       <include name="mysql-connector-java-5.0.7-bin.jar" />
33 +               <include name="pdfbox.jar" />
34 +               <include name="jempbox.jar" />
35 +       <include name="mysql-connector-java.jar" />
36          <!--<include name="substance-4.1.jar" />-->
37          <!-- Plugin runtime dependencies -->
38 -               <include name="plugin/JPFCodeGenerator-rt.jar" />
39 -               <include name="plugin/jpf.jar" />
40 -               <include name="plugin/jpf-boot.jar" />
41 -               <include name="plugin/commons-logging.jar" />
42 +               <include name="JPFCodeGenerator-rt.jar" />
43 +               <include name="jpf.jar" />
44 +               <include name="jpf-boot.jar" />
45 +               <include name="commons-logging.jar" />
46         </fileset>
47  
48         <!-- Build classpath -->
49 @@ -134,10 +133,10 @@
50  
51         <!-- Classpath for running the code generator -->
52         <path id="codegenerator">
53 -               <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
54 -               <pathelement location="${lib.dir}/plugin/jpf.jar" />
55 -               <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
56 -               <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
57 +               <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
58 +               <pathelement location="${lib.dir}/jpf.jar" />
59 +               <pathelement location="${lib.dir}/jpf-boot.jar" />
60 +               <pathelement location="${lib.dir}/velocity.jar" />
61         </path>
62  
63         <!-- Classpath for tests -->
64 @@ -217,7 +216,7 @@
65         </target>
66  
67         <!-- Jars up project -->
68 -       <target name="jars" depends="build, unjarlib">
69 +       <target name="jars" depends="build">
70                 <mkdir dir="${build.lib}" />
71                 <mkdir dir="${build.tmp}" />
72                 <jar destfile="${build.lib}/${build.jar}">
73 @@ -612,6 +611,6 @@
74                 </jalopy>
75         </target>
76  
77 -       <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
78 +<!--   <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" /> -->
79  
80  </project>