debian/patches/02_libs.patch

   1 Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
   2 Author: Philip Rinn <rinni@gmx.net>
   3 Description: Use debian libraries and disable unnecesary unjarlib target,
   4 --- a/build.xml
   5 +++ b/build.xml
   6 @@ -85,7 +85,7 @@
   7         <property name="help.dir" value="${src.dir}/help" />
   8         <property name="extensions.dir" value="${src.dir}/extensions" />
   9         <property name="layout.dir" value="${src.dir}/resource/layout" />
  10 -       <property name="lib.dir" value="lib" />
  11 +       <property name="lib.dir" value="/usr/share/java" />
  12         <property name="tests.dir" value="${src.dir}/tests" />
  13
  14         <property name="nsis.executable" value="makensis.exe"/>
  15 @@ -107,22 +107,22 @@
  16
  17         <fileset id="jarsFileset" dir="${lib.dir}">
  18                 <include name="antlr.jar" />
  19 -               <include name="antlr-3.0b5.jar" />
  20 -               <include name="looks-2.3.1.jar" />
  21 -               <include name="forms-1.1.0.jar" />
  22 +               <include name="antlr3.jar" />
  23 +               <include name="antlr3-runtime.jar" />
  24 +               <include name="looks.jar" />
  25 +               <include name="forms.jar" />
  26                 <include name="spin.jar" />
  27 -               <include name="glazedlists-1.7.0_java15.jar" />
  28 +               <include name="glazedlists.jar" />
  29                 <include name="microba.jar" />
  30 -               <include name="PDFBox-0.7.3-dev-reduced.jar" />
  31 -               <include name="JempBox-0.2.0.jar" />
  32 -               <include name="zoom-java.jar" />
  33 -       <include name="mysql-connector-java-5.0.7-bin.jar" />
  34 +               <include name="pdfbox.jar" />
  35 +               <include name="jempbox.jar" />
  36 +       <include name="mysql-connector-java.jar" />
  37          <!--<include name="substance-4.1.jar" />-->
  38          <!-- Plugin runtime dependencies -->
  39 -               <include name="plugin/JPFCodeGenerator-rt.jar" />
  40 -               <include name="plugin/jpf.jar" />
  41 -               <include name="plugin/jpf-boot.jar" />
  42 -               <include name="plugin/commons-logging.jar" />
  43 +               <include name="JPFCodeGenerator-rt.jar" />
  44 +               <include name="jpf.jar" />
  45 +               <include name="jpf-boot.jar" />
  46 +               <include name="commons-logging.jar" />
  47         </fileset>
  48
  49         <!-- Build classpath -->
  50 @@ -134,10 +134,10 @@
  51
  52         <!-- Classpath for running the code generator -->
  53         <path id="codegenerator">
  54 -               <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
  55 -               <pathelement location="${lib.dir}/plugin/jpf.jar" />
  56 -               <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
  57 -               <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
  58 +               <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
  59 +               <pathelement location="${lib.dir}/jpf.jar" />
  60 +               <pathelement location="${lib.dir}/jpf-boot.jar" />
  61 +               <pathelement location="${lib.dir}/velocity.jar" />
  62         </path>
  63
  64         <!-- Classpath for tests -->
  65 @@ -217,7 +217,7 @@
  66         </target>
  67
  68         <!-- Jars up project -->
  69 -       <target name="jars" depends="build, unjarlib">
  70 +       <target name="jars" depends="build">
  71                 <mkdir dir="${build.lib}" />
  72                 <mkdir dir="${build.tmp}" />
  73                 <jar destfile="${build.lib}/${build.jar}">
  74 @@ -623,6 +623,4 @@ Number (CCN)           maintenance
  75                 </jalopy>
  76         </target>
  77
  78 -       <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.1.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
  79 -
  80  </project>