update changelog
[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-07-09
7
8 --- a/build.xml
9 +++ b/build.xml
10 @@ -68,8 +68,8 @@
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="buildlib.dir" value="/usr/share/java" />
18  
19         <property name="osxbin.dir" value="osx" />
20  
21 @@ -98,11 +98,13 @@
22      <!-- Done by MrDlib -->
23  
24         <!-- Build classpath -->
25 -       <filelist id="jars" />
26 +       <fileset id="jars" dir="${buildlib.dir}">
27 +               <include name="*.jar" />
28 +       </fileset>
29         <path id="classpath">
30                 <pathelement path="${build.classes}" />
31                 <pathelement path="${build.dir}" />
32 -               <filelist refid="jars" />
33 +               <fileset refid="jars" />
34         </path>
35  
36         <target name="run" depends="build">
37 @@ -149,7 +151,7 @@
38                 <copy file="${osxbin.dir}/MacAdapter.class" todir="${build.classes.osx}" />
39         </target>
40  
41 -       <target name="jars" depends="build, unjarlib" description="Jars up project">
42 +       <target name="jars" depends="build" description="Jars up project">
43                 <mkdir dir="${build.lib}" />
44  
45                 <mkdir dir="${build.tmp}" />
46 @@ -324,7 +326,7 @@
47         <target name="unjarlib" description="Unpacks jars from lib directory into temp directory">
48                 <mkdir dir="${build.tmp}" />
49                 <unjar dest="${build.tmp}">
50 -                       <filelist refid="jars" />
51 +                       <fileset refid="jars" />
52                 </unjar>
53                 <!-- done by MrDlib -->
54                 <delete includeEmptyDirs="true">
55 @@ -519,8 +521,6 @@
56            Auxiliary targets
57           +++++++++++++++++++++++++++++++++++++++++++++++++-->
58  
59 -       <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
60 -
61         <macrodef name="compresssrc">
62          <attribute name="git-core-autocrlf" />
63          <attribute name="temp-dir" />