Add a new patch to add back a removed file.
[debian/jabref.git] / debian / patches / debian_libs.patch
1 Description: Use debian libraries and disable unnecesary unjarlib target,\r
2 Forwarded: not needed
3 Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>,\r
4  Philip Rinn <rinni@gmx.net>\r
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,7 +76,9 @@
11         <property name="help.dir" value="${src.dir}/help" />\r
12         <property name="extensions.dir" value="${src.dir}/extensions" />\r
13         <property name="layout.dir" value="${src.dir}/resource/layout" />\r
14 -       <property name="lib.dir" value="lib" />\r
15 +       <property name="lib.dir" value="/usr/share/java" />\r
16 +       <property name="oo.dir" value="/usr/lib/libreoffice/program/classes" />\r
17 +       <property name="ure.dir" value="/usr/lib/ure/share/java" />\r
18         <property name="buildlib.dir" value="buildlib" />\r
19         <property name="tests.dir" value="${src.dir}/tests" />\r
20  \r
21 @@ -102,33 +104,35 @@
22  \r
23         <fileset id="jarsFileset" dir="${lib.dir}">\r
24                 <include name="antlr.jar" />\r
25 -               <include name="antlr-3.4-complete.jar" />\r
26 -        <include name="jgoodies-common-1.4.0.jar" />\r
27 -               <include name="jgoodies-looks-2.5.2.jar" />\r
28 -               <include name="jgoodies-forms-1.6.0.jar" />\r
29 -               <include name="jayatana-1.2.4.jar" />\r
30 +               <include name="antlr3.jar" />\r
31 +               <include name="antlr3-runtime.jar" />\r
32 +        <include name="jgoodies-common.jar" />\r
33 +               <include name="jgoodies-looks.jar" />\r
34 +               <include name="jgoodies-forms.jar" />\r
35                 <include name="spin.jar" />\r
36 -               <include name="glazedlists-1.8.0_java15.jar" />\r
37 +               <include name="glazedlists.jar" />\r
38                 <include name="microba.jar" />\r
39 -               <include name="pdfbox-1.7.1.jar" />\r
40 -               <include name="jempbox-1.7.1.jar" />\r
41 -               <include name="fontbox-1.7.1.jar" />\r
42 +               <include name="pdfbox.jar" />\r
43 +               <include name="jempbox.jar" />\r
44 +               <include name="fontbox.jar" />\r
45                 <include name="zoom-java.jar" />\r
46 -       <include name="mysql-connector-java-5.0.7-bin.jar" />\r
47 -               <include name="postgresql-9.2-1002.jdbc4.jar" />\r
48 +       <include name="mysql-connector-java.jar" />\r
49 +               <include name="postgresql.jar" />\r
50          <!-- Plugin runtime dependencies -->\r
51 -               <include name="plugin/JPFCodeGenerator-rt.jar" />\r
52 -               <include name="plugin/jpf.jar" />\r
53 -               <include name="plugin/jpf-boot.jar" />\r
54 -               <include name="plugin/commons-logging.jar" />\r
55 +               <include name="JPFCodeGenerator-rt.jar" />\r
56 +               <include name="jpf.jar" />\r
57 +               <include name="jpf-boot.jar" />\r
58 +               <include name="commons-logging.jar" />\r
59         </fileset>\r
60  \r
61      <!-- Openoffice connection dependencies. Compile-time only -->\r
62 -    <fileset id="ooFileset" dir="${lib.dir}">\r
63 -        <include name="oo/unoil.jar" />\r
64 -        <include name="oo/ridl.jar" />\r
65 -        <include name="oo/juh.jar" />\r
66 -        <include name="oo/jurt.jar" />\r
67 +    <fileset id="ureFileset" dir="${ure.dir}">\r
68 +        <include name="ridl.jar" />\r
69 +        <include name="juh.jar" />\r
70 +        <include name="jurt.jar" />\r
71 +    </fileset>\r
72 +    <fileset id="ooFileset" dir="${oo.dir}">\r
73 +        <include name="unoil.jar" />\r
74      </fileset>\r
75  \r
76      <!-- Done by MrDlib -->\r
77 @@ -151,14 +155,15 @@
78          <!-- Done by MrDlib -->\r
79                 <fileset refid="jarsFileset" />\r
80          <fileset refid="ooFileset" />\r
81 +        <fileset refid="ureFileset" />\r
82         </path>\r
83  \r
84         <!-- Classpath for running the code generator -->\r
85         <path id="codegenerator">\r
86 -               <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />\r
87 -               <pathelement location="${lib.dir}/plugin/jpf.jar" />\r
88 -               <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />\r
89 -               <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />\r
90 +               <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />\r
91 +               <pathelement location="${lib.dir}/jpf.jar" />\r
92 +               <pathelement location="${lib.dir}/jpf-boot.jar" />\r
93 +               <pathelement location="${lib.dir}/velocity.jar" />\r
94         </path>\r
95  \r
96         <!-- Classpath for tests -->\r
97 @@ -239,7 +244,7 @@
98         </target>\r
99  \r
100         <!-- Jars up project -->\r
101 -       <target name="jars" depends="build, unjarlib">\r
102 +       <target name="jars" depends="build">\r
103                 <mkdir dir="${build.lib}" />\r
104          \r
105                 <mkdir dir="${build.tmp}" />\r
106 @@ -631,8 +636,6 @@
107                 </jalopy>\r
108         </target>\r
109  \r
110 -       <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />\r
111 -\r
112         <target name="zipsrc">\r
113                 <!-- 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) -->\r
114                 <tempfile property="temp.dir" destDir="${java.io.tmpdir}" prefix="jabrefsrc"/>\r