737032d392645584859fe601b9384ef797d866ed
[debian/jabref.git] / debian / patches / debian_libs.patch
1 Description: Use debian libraries and disable unnecesary unjarlib target,
2 Forwarded: not needed
3 Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>,
4  Philip Rinn <rinni@gmx.net>
5 Reviewed-by: gregor herrmann <gregoa@debian.org>
6 Last-Update: 2013-01-01
7
8 --- a/build.xml
9 +++ b/build.xml
10 @@ -76,8 +76,10 @@
11         <property name="help.dir" value="${src.dir}/help" />
12         <property name="extensions.dir" value="${src.dir}/extensions" />
13         <property name="layout.dir" value="${src.dir}/resource/layout" />
14 -       <property name="lib.dir" value="lib" />
15 -       <property name="buildlib.dir" value="buildlib" />
16 +       <property name="lib.dir" value="/usr/share/java" />
17 +       <property name="oo.dir" value="/usr/lib/libreoffice/program/classes" />
18 +       <property name="ure.dir" value="/usr/lib/ure/share/java" />
19 +       <property name="buildlib.dir" value="/usr/share/java" />
20         <property name="tests.dir" value="${src.dir}/tests" />
21  
22         <property name="osxbin.dir" value="osx" />
23 @@ -102,33 +104,35 @@
24  
25         <fileset id="jarsFileset" dir="${lib.dir}">
26                 <include name="antlr.jar" />
27 -               <include name="antlr-3.4-complete.jar" />
28 -        <include name="jgoodies-common-1.4.0.jar" />
29 -               <include name="jgoodies-looks-2.5.2.jar" />
30 -               <include name="jgoodies-forms-1.6.0.jar" />
31 -               <include name="jayatana-1.2.4.jar" />
32 +               <include name="antlr3.jar" />
33 +               <include name="antlr3-runtime.jar" />
34 +        <include name="jgoodies-common.jar" />
35 +               <include name="jgoodies-looks.jar" />
36 +               <include name="jgoodies-forms.jar" />
37                 <include name="spin.jar" />
38 -               <include name="glazedlists-1.8.0_java15.jar" />
39 +               <include name="glazedlists.jar" />
40                 <include name="microba.jar" />
41 -               <include name="pdfbox-1.7.1.jar" />
42 -               <include name="jempbox-1.7.1.jar" />
43 -               <include name="fontbox-1.7.1.jar" />
44 +               <include name="pdfbox.jar" />
45 +               <include name="jempbox.jar" />
46 +               <include name="fontbox.jar" />
47                 <include name="zoom-java.jar" />
48 -       <include name="mysql-connector-java-5.0.7-bin.jar" />
49 -               <include name="postgresql-9.2-1002.jdbc4.jar" />
50 +       <include name="mysql-connector-java.jar" />
51 +               <include name="postgresql.jar" />
52          <!-- Plugin runtime dependencies -->
53 -               <include name="plugin/JPFCodeGenerator-rt.jar" />
54 -               <include name="plugin/jpf.jar" />
55 -               <include name="plugin/jpf-boot.jar" />
56 -               <include name="plugin/commons-logging.jar" />
57 +               <include name="JPFCodeGenerator-rt.jar" />
58 +               <include name="jpf.jar" />
59 +               <include name="jpf-boot.jar" />
60 +               <include name="commons-logging.jar" />
61         </fileset>
62  
63      <!-- Openoffice connection dependencies. Compile-time only -->
64 -    <fileset id="ooFileset" dir="${lib.dir}">
65 -        <include name="oo/unoil.jar" />
66 -        <include name="oo/ridl.jar" />
67 -        <include name="oo/juh.jar" />
68 -        <include name="oo/jurt.jar" />
69 +    <fileset id="ureFileset" dir="${ure.dir}">
70 +        <include name="ridl.jar" />
71 +        <include name="juh.jar" />
72 +        <include name="jurt.jar" />
73 +    </fileset>
74 +    <fileset id="ooFileset" dir="${oo.dir}">
75 +        <include name="unoil.jar" />
76      </fileset>
77  
78      <!-- Done by MrDlib -->
79 @@ -151,14 +155,15 @@
80          <!-- Done by MrDlib -->
81                 <fileset refid="jarsFileset" />
82          <fileset refid="ooFileset" />
83 +        <fileset refid="ureFileset" />
84         </path>
85  
86         <!-- Classpath for running the code generator -->
87         <path id="codegenerator">
88 -               <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
89 -               <pathelement location="${lib.dir}/plugin/jpf.jar" />
90 -               <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
91 -               <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
92 +               <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
93 +               <pathelement location="${lib.dir}/jpf.jar" />
94 +               <pathelement location="${lib.dir}/jpf-boot.jar" />
95 +               <pathelement location="${lib.dir}/velocity.jar" />
96         </path>
97  
98         <!-- Classpath for tests -->
99 @@ -238,7 +243,7 @@
100         </target>
101  
102         <!-- Jars up project -->
103 -       <target name="jars" depends="build, unjarlib">
104 +       <target name="jars" depends="build">
105                 <mkdir dir="${build.lib}" />
106  
107                 <mkdir dir="${build.tmp}" />
108 @@ -645,8 +650,6 @@
109                 </jalopy>
110         </target>
111  
112 -       <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
113 -
114         <target name="compresssrc">
115                 <!-- clone current repo into tmp dir. Reason: we want to have a clean src.zip, but do not want to execute "git clean -xdf" to allow developers having some temporary files (and user.properties) -->
116                 <mkdir dir="${temp.dir}"/>