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