Drop fix-headless-bibtex-output.diff, refresh other patches.
[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: 2015-05-19
7
8 --- a/build.xml
9 +++ b/build.xml
10 @@ -71,8 +71,10 @@
11         <property name="help.dir" value="${resources.dir}/help" />
12         <property name="extensions.dir" value="${resources.dir}/extensions" />
13         <property name="layout.dir" value="${resources.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  
21         <property name="osxbin.dir" value="osx" />
22  
23 @@ -96,36 +98,37 @@
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="antlr3.jar" />
32 +        <include name="jgoodies-common.jar" />
33 +               <include name="jgoodies-looks.jar" />
34 +               <include name="jgoodies-forms.jar" />
35          <include name="jgoodies/jgoodies-uif-lite.jar" />
36 -        <include name="jna-4.1.0.jar" />
37 +        <include name="jna.jar" />
38          <include name="ritopt/ritopt-0.2.1-bin.jar" />
39 -               <include name="jayatana-1.2.4.jar" />
40                 <include name="spin.jar" />
41 -               <include name="glazedlists-1.8.0_java15.jar" />
42 +               <include name="glazedlists.jar" />
43                 <include name="microba.jar" />
44 -               <include name="pdfbox-1.7.1.jar" />
45 -               <include name="jempbox-1.7.1.jar" />
46 -               <include name="fontbox-1.7.1.jar" />
47 +               <include name="pdfbox.jar" />
48 +               <include name="jempbox.jar" />
49 +               <include name="fontbox.jar" />
50                 <include name="zoom-java.jar" />
51 -       <include name="mysql-connector-java-5.0.7-bin.jar" />
52 -               <include name="postgresql-9.2-1002.jdbc4.jar" />
53 +       <include name="mysql-connector-java.jar" />
54 +               <include name="postgresql.jar" />
55          <!-- Plugin runtime dependencies -->
56 -               <include name="plugin/JPFCodeGenerator-rt.jar" />
57 -               <include name="plugin/jpf.jar" />
58 -               <include name="plugin/jpf-boot.jar" />
59 -               <include name="plugin/commons-logging.jar" />
60 +               <include name="JPFCodeGenerator-rt.jar" />
61 +               <include name="jpf.jar" />
62 +               <include name="jpf-boot.jar" />
63 +               <include name="commons-logging.jar" />
64         </fileset>
65  
66      <!-- Openoffice connection dependencies. Compile-time only -->
67 -    <fileset id="ooFileset" dir="${lib.dir}">
68 -        <include name="oo/unoil.jar" />
69 -        <include name="oo/ridl.jar" />
70 -        <include name="oo/juh.jar" />
71 -        <include name="oo/jurt.jar" />
72 +    <fileset id="ureFileset" dir="${ure.dir}">
73 +        <include name="ridl.jar" />
74 +        <include name="juh.jar" />
75 +        <include name="jurt.jar" />
76 +    </fileset>
77 +    <fileset id="ooFileset" dir="${oo.dir}">
78 +        <include name="unoil.jar" />
79      </fileset>
80  
81      <!-- Done by MrDlib -->
82 @@ -146,6 +149,7 @@
83          <!-- Done by MrDlib -->
84                 <fileset refid="jarsFileset" />
85          <fileset refid="ooFileset" />
86 +        <fileset refid="ureFileset" />
87         </path>
88  
89         <target name="run" depends="build">
90 @@ -188,7 +192,7 @@
91         </target>
92  
93         <!-- Jars up project -->
94 -       <target name="jars" depends="build, unjarlib">
95 +       <target name="jars" depends="build">
96                 <mkdir dir="${build.lib}" />
97  
98                 <mkdir dir="${build.tmp}" />
99 @@ -510,8 +514,6 @@
100            Auxiliary targets
101           +++++++++++++++++++++++++++++++++++++++++++++++++-->
102  
103 -       <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
104 -
105         <macrodef name="compresssrc">
106          <attribute name="git-core-autocrlf" />
107          <attribute name="temp-dir" />