update debian_libs.patch: we now have /usr/share/java/jgoodies-forms.jar
[debian/jabref.git] / debian / patches / debian_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 @@ -75,7 +75,9 @@
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="oo.dir" value="/usr/lib/libreoffice/program/classes" />
13 +       <property name="ure.dir" value="/usr/lib/ure/share/java" />
14         <property name="buildlib.dir" value="buildlib" />
15         <property name="tests.dir" value="${src.dir}/tests" />
16  
17 @@ -100,33 +102,35 @@
18  
19         <fileset id="jarsFileset" dir="${lib.dir}">
20                 <include name="antlr.jar" />
21 -               <include name="antlr-3.4-complete.jar" />
22 -        <include name="jgoodies-common-1.4.0.jar" />
23 -               <include name="jgoodies-looks-2.5.2.jar" />
24 -               <include name="jgoodies-forms-1.6.0.jar" />
25 -               <include name="jayatana-1.2.4.jar" />
26 +               <include name="antlr3.jar" />
27 +               <include name="antlr3-runtime.jar" />
28 +        <include name="jgoodies-common.jar" />
29 +               <include name="jgoodies-looks.jar" />
30 +               <include name="jgoodies-forms.jar" />
31                 <include name="spin.jar" />
32 -               <include name="glazedlists-1.8.0_java15.jar" />
33 +               <include name="glazedlists.jar" />
34                 <include name="microba.jar" />
35 -               <include name="pdfbox-1.7.1.jar" />
36 -               <include name="jempbox-1.7.1.jar" />
37 -               <include name="fontbox-1.7.1.jar" />
38 +               <include name="pdfbox.jar" />
39 +               <include name="jempbox.jar" />
40 +               <include name="fontbox.jar" />
41                 <include name="zoom-java.jar" />
42 -       <include name="mysql-connector-java-5.0.7-bin.jar" />
43 -               <include name="postgresql-9.2-1002.jdbc4.jar" />
44 +       <include name="mysql-connector-java.jar" />
45 +               <include name="postgresql.jar" />
46          <!-- Plugin runtime dependencies -->
47 -               <include name="plugin/JPFCodeGenerator-rt.jar" />
48 -               <include name="plugin/jpf.jar" />
49 -               <include name="plugin/jpf-boot.jar" />
50 -               <include name="plugin/commons-logging.jar" />
51 +               <include name="JPFCodeGenerator-rt.jar" />
52 +               <include name="jpf.jar" />
53 +               <include name="jpf-boot.jar" />
54 +               <include name="commons-logging.jar" />
55         </fileset>
56  
57      <!-- Openoffice connection dependencies. Compile-time only -->
58 -    <fileset id="ooFileset" dir="${lib.dir}">
59 -        <include name="oo/unoil.jar" />
60 -        <include name="oo/ridl.jar" />
61 -        <include name="oo/juh.jar" />
62 -        <include name="oo/jurt.jar" />
63 +    <fileset id="ureFileset" dir="${ure.dir}">
64 +        <include name="ridl.jar" />
65 +        <include name="juh.jar" />
66 +        <include name="jurt.jar" />
67 +    </fileset>
68 +    <fileset id="ooFileset" dir="${oo.dir}">
69 +        <include name="unoil.jar" />
70      </fileset>
71  
72      <!-- Done by MrDlib -->
73 @@ -149,14 +153,15 @@
74          <!-- Done by MrDlib -->
75                 <fileset refid="jarsFileset" />
76          <fileset refid="ooFileset" />
77 +        <fileset refid="ureFileset" />
78         </path>
79  
80         <!-- Classpath for running the code generator -->
81         <path id="codegenerator">
82 -               <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
83 -               <pathelement location="${lib.dir}/plugin/jpf.jar" />
84 -               <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
85 -               <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
86 +               <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
87 +               <pathelement location="${lib.dir}/jpf.jar" />
88 +               <pathelement location="${lib.dir}/jpf-boot.jar" />
89 +               <pathelement location="${lib.dir}/velocity.jar" />
90         </path>
91  
92         <!-- Classpath for tests -->
93 @@ -237,7 +242,7 @@
94         </target>
95  
96         <!-- Jars up project -->
97 -       <target name="jars" depends="build, unjarlib">
98 +       <target name="jars" depends="build">
99                 <mkdir dir="${build.lib}" />
100          
101                 <mkdir dir="${build.tmp}" />
102 @@ -595,6 +600,4 @@
103                 </jalopy>
104         </target>
105  
106 -       <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
107 -
108  </project>