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 @@ -74,7 +74,9 @@
   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="oo.dir" value="/usr/lib/libreoffice/program/classes" />
  13 +       <property name="ure.dir" value="/usr/lib/ure/share/java" />
  14         <property name="tests.dir" value="${src.dir}/tests" />
  15
  16         <property name="nsis.executable" value="C:\Program files\NSIS\makensis.exe"/>
  17 @@ -95,34 +97,36 @@
  18         </condition>
  19
  20         <fileset id="jarsFileset" dir="${lib.dir}">
  21 -               <include name="antlr.jar" />
  22 -               <include name="antlr-3.0b5.jar" />
  23 -        <include name="jgoodies-common-1.3.1.jar" />
  24 -               <include name="jgoodies-looks-2.5.1.jar" />
  25 -               <include name="jgoodies-forms-1.5.1.jar" />
  26 +               <include name="antlr3.jar" />
  27 +               <include name="antlr3-runtime.jar" />
  28 +        <include name="jgoodies-common.jar" />
  29 +               <include name="jgoodies-looks.jar" />
  30 +               <include name="jgoodies-forms.jar" />
  31                 <include name="spin.jar" />
  32 -               <include name="glazedlists-1.8.0_java15.jar" />
  33 +               <include name="glazedlists.jar" />
  34                 <include name="microba.jar" />
  35 -               <include name="pdfbox-1.6.0.jar" />
  36 -               <include name="jempbox-1.6.0.jar" />
  37 -               <include name="fontbox-1.6.0.jar" />
  38 +               <include name="pdfbox.jar" />
  39 +               <include name="jempbox.jar" />
  40 +               <include name="fontbox.jar" />
  41                 <include name="zoom-java.jar" />
  42 -       <include name="mysql-connector-java-5.0.7-bin.jar" />
  43 -               <include name="postgresql-9.1-902.jdbc4.jar" />
  44 +       <include name="mysql-connector-java.jar" />
  45 +               <include name="postgresql.jar" />
  46          <!--<include name="substance-4.1.jar" />-->
  47          <!-- Plugin runtime dependencies -->
  48 -               <include name="plugin/JPFCodeGenerator-rt.jar" />
  49 -               <include name="plugin/jpf.jar" />
  50 -               <include name="plugin/jpf-boot.jar" />
  51 -               <include name="plugin/commons-logging.jar" />
  52 +               <include name="JPFCodeGenerator-rt.jar" />
  53 +               <include name="jpf.jar" />
  54 +               <include name="jpf-boot.jar" />
  55 +               <include name="commons-logging.jar" />
  56         </fileset>
  57
  58      <!-- Openoffice connection dependencies. Compile-time only -->
  59 -    <fileset id="ooFileset" dir="${lib.dir}">
  60 -        <include name="oo/unoil.jar" />
  61 -        <include name="oo/ridl.jar" />
  62 -        <include name="oo/juh.jar" />
  63 -        <include name="oo/jurt.jar" />
  64 +    <fileset id="ureFileset" dir="${ure.dir}">
  65 +        <include name="ridl.jar" />
  66 +        <include name="juh.jar" />
  67 +        <include name="jurt.jar" />
  68 +    </fileset>
  69 +    <fileset id="ooFileset" dir="${oo.dir}">
  70 +        <include name="unoil.jar" />
  71      </fileset>
  72
  73      <!-- Done by MrDlib -->
  74 @@ -145,14 +149,15 @@
  75          <!-- Done by MrDlib -->
  76                 <fileset refid="jarsFileset" />
  77          <fileset refid="ooFileset" />
  78 +        <fileset refid="ureFileset" />
  79         </path>
  80
  81         <!-- Classpath for running the code generator -->
  82         <path id="codegenerator">
  83 -               <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
  84 -               <pathelement location="${lib.dir}/plugin/jpf.jar" />
  85 -               <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
  86 -               <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
  87 +               <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
  88 +               <pathelement location="${lib.dir}/jpf.jar" />
  89 +               <pathelement location="${lib.dir}/jpf-boot.jar" />
  90 +               <pathelement location="${lib.dir}/velocity.jar" />
  91         </path>
  92
  93         <!-- Classpath for tests -->
  94 @@ -233,7 +238,7 @@
  95         </target>
  96
  97         <!-- Jars up project -->
  98 -       <target name="jars" depends="build, unjarlib">
  99 +       <target name="jars" depends="build">
 100                 <mkdir dir="${build.lib}" />
 101
 102                 <mkdir dir="${build.tmp}" />
 103 @@ -660,6 +665,4 @@
 104                 </jalopy>
 105         </target>
 106
 107 -       <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
 108 -
 109  </project>