debian/patches/02_libs.patch

   1 Author: <gerardo@sophie.gerardo.com.ve>
   2 Description: Use debian libraries and disable unnecesary unjarlib target,
   3 --- a/build.xml
   4 +++ b/build.xml
   5 @@ -86,7 +86,7 @@
   6         <property name="layout.dir" value="${src.dir}/resource/layout" />
   7
   8         <!-- Set the properties for library directories -->
   9 -       <property name="library.directory" value="lib" />
  10 +       <property name="library.directory" value="/usr/share/java" />
  11
  12  <!--    <property name="nsis.executable" value="makensis.exe"/> -->
  13         <property name="nsis.executable.linux" value="makensis"/>
  14 @@ -105,22 +105,21 @@
  15                 </and>
  16         </condition>
  17
  18 -       <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
  19 -
  20 -
  21 +<!--   <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
  22 +-->
  23         <!-- Build classpath -->
  24         <path id="classpath">
  25                 <pathelement path="${build.classes}" />
  26                 <pathelement path="${build.dir}" />
  27                 <pathelement location="${library.directory}/antlr.jar" />
  28 -               <pathelement location="${library.directory}/antlr-3.0b5.jar" />
  29 -               <pathelement location="${library.directory}/looks-2.0.4.jar" />
  30 -               <pathelement location="${library.directory}/forms-1.1.0.jar" />
  31 +               <pathelement location="${library.directory}/antlr3.jar" />
  32 +               <pathelement location="${library.directory}/looks.jar" />
  33 +               <pathelement location="${library.directory}/forms.jar" />
  34                 <pathelement location="${library.directory}/spin.jar" />
  35 -               <pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" />
  36 +               <pathelement location="${library.directory}/glazedlists.jar" />
  37                 <pathelement location="${library.directory}/microba.jar" />
  38 -               <pathelement location="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" />
  39 -               <pathelement location="${library.directory}/JempBox-0.1.0-dev.jar" />
  40 +               <pathelement location="${library.directory}/pdfbox.jar" />
  41 +               <pathelement location="${library.directory}/jempbox.jar" />
  42         </path>
  43
  44         <target name="run" depends="build">
  45 @@ -194,7 +193,8 @@
  46         </target>
  47
  48         <!-- Jars up project -->
  49 -       <target name="jars" depends="build, unjarlib">
  50 +       <!-- The unjarlib target is not needed, we'll use the jars in the classpath -->
  51 +       <target name="jars" depends="build">
  52                 <mkdir dir="${build.lib}" />
  53                 <mkdir dir="${build.tmp}" />
  54                 <jar destfile="${build.lib}/${build.jar}">