debian/patches/02_libs.dpatch

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