Remove patch 06_BibtexEntry.patch, applied upstream.
[debian/jabref.git] / debian / patches / 02_libs.patch
index d45cc4f135f5fd39155c752dde20e2a715e3b85c..063c85e54d0ca3c1de9e7c966b501db905f8b84e 100644 (file)
@@ -1,54 +1,80 @@
-Author: <gerardo@sophie.gerardo.com.ve>
+Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
+Author: Philip Rinn <rinni@gmx.net>
 Description: Use debian libraries and disable unnecesary unjarlib target,
 --- a/build.xml
 +++ b/build.xml
-@@ -86,7 +86,7 @@
+@@ -85,7 +85,7 @@
+       <property name="help.dir" value="${src.dir}/help" />
+       <property name="extensions.dir" value="${src.dir}/extensions" />
        <property name="layout.dir" value="${src.dir}/resource/layout" />
+-      <property name="lib.dir" value="lib" />
++      <property name="lib.dir" value="/usr/share/java" />
+       <property name="tests.dir" value="${src.dir}/tests" />
  
-       <!-- Set the properties for library directories -->
--      <property name="library.directory" value="lib" />
-+      <property name="library.directory" value="/usr/share/java" />
+       <property name="nsis.executable" value="makensis.exe"/>
+@@ -107,22 +107,22 @@
  
- <!--    <property name="nsis.executable" value="makensis.exe"/> -->
-       <property name="nsis.executable.linux" value="makensis"/>
-@@ -105,22 +105,21 @@
-               </and>
-       </condition>
+       <fileset id="jarsFileset" dir="${lib.dir}">
+               <include name="antlr.jar" />
+-              <include name="antlr-3.0b5.jar" />
+-              <include name="looks-2.3.1.jar" />
+-              <include name="forms-1.1.0.jar" />
++              <include name="antlr3.jar" />
++              <include name="antlr3-runtime.jar" />
++              <include name="looks.jar" />
++              <include name="forms.jar" />
+               <include name="spin.jar" />
+-              <include name="glazedlists-1.7.0_java15.jar" />
++              <include name="glazedlists.jar" />
+               <include name="microba.jar" />
+-              <include name="PDFBox-0.7.3-dev-reduced.jar" />
+-              <include name="JempBox-0.2.0.jar" />
+-              <include name="zoom-java.jar" />
+-      <include name="mysql-connector-java-5.0.7-bin.jar" />
++              <include name="pdfbox.jar" />
++              <include name="jempbox.jar" />
++      <include name="mysql-connector-java.jar" />
+         <!--<include name="substance-4.1.jar" />-->
+         <!-- Plugin runtime dependencies -->
+-              <include name="plugin/JPFCodeGenerator-rt.jar" />
+-              <include name="plugin/jpf.jar" />
+-              <include name="plugin/jpf-boot.jar" />
+-              <include name="plugin/commons-logging.jar" />
++              <include name="JPFCodeGenerator-rt.jar" />
++              <include name="jpf.jar" />
++              <include name="jpf-boot.jar" />
++              <include name="commons-logging.jar" />
+       </fileset>
  
--      <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
--
--
-+<!--  <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
-+-->
        <!-- Build classpath -->
-       <path id="classpath">
-               <pathelement path="${build.classes}" />
-               <pathelement path="${build.dir}" />
-               <pathelement location="${library.directory}/antlr.jar" />
--              <pathelement location="${library.directory}/antlr-3.0b5.jar" />
--              <pathelement location="${library.directory}/looks-2.0.4.jar" />
--              <pathelement location="${library.directory}/forms-1.1.0.jar" />
-+              <pathelement location="${library.directory}/antlr3.jar" />
-+              <pathelement location="${library.directory}/looks.jar" />
-+              <pathelement location="${library.directory}/forms.jar" />
-               <pathelement location="${library.directory}/spin.jar" />
--              <pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" />
-+              <pathelement location="${library.directory}/glazedlists.jar" />
-               <pathelement location="${library.directory}/microba.jar" />
--              <pathelement location="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" />
--              <pathelement location="${library.directory}/JempBox-0.1.0-dev.jar" />
-+              <pathelement location="${library.directory}/pdfbox.jar" />
-+              <pathelement location="${library.directory}/jempbox.jar" />
+@@ -134,10 +134,10 @@
+       <!-- Classpath for running the code generator -->
+       <path id="codegenerator">
+-              <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
+-              <pathelement location="${lib.dir}/plugin/jpf.jar" />
+-              <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
+-              <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
++              <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
++              <pathelement location="${lib.dir}/jpf.jar" />
++              <pathelement location="${lib.dir}/jpf-boot.jar" />
++              <pathelement location="${lib.dir}/velocity.jar" />
        </path>
  
-       <target name="run" depends="build">
-@@ -194,7 +193,8 @@
+       <!-- Classpath for tests -->
+@@ -217,7 +217,7 @@
        </target>
  
        <!-- Jars up project -->
 -      <target name="jars" depends="build, unjarlib">
-+      <!-- The unjarlib target is not needed, we'll use the jars in the classpath -->
 +      <target name="jars" depends="build">
                <mkdir dir="${build.lib}" />
                <mkdir dir="${build.tmp}" />
                <jar destfile="${build.lib}/${build.jar}">
+@@ -623,6 +623,4 @@ Number (CCN)           maintenance
+               </jalopy>
+       </target>
+-      <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.1.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
+-
+ </project>