try to fix classpath in debian_libs.patch
[debian/jabref.git] / debian / patches / debian_libs.patch
index 737032d..f3990c2 100644 (file)
@@ -3,114 +3,61 @@ Forwarded: not needed
 Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>,
  Philip Rinn <rinni@gmx.net>
 Reviewed-by: gregor herrmann <gregoa@debian.org>
-Last-Update: 2013-01-01
+Last-Update: 2015-07-09
 
 --- a/build.xml
 +++ b/build.xml
-@@ -76,8 +76,10 @@
-       <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" />
+@@ -68,8 +68,8 @@
+       <property name="help.dir" value="${resources.dir}/help" />
+       <property name="extensions.dir" value="${resources.dir}/extensions" />
+       <property name="layout.dir" value="${resources.dir}/resource/layout" />
 -      <property name="lib.dir" value="lib" />
 -      <property name="buildlib.dir" value="buildlib" />
 +      <property name="lib.dir" value="/usr/share/java" />
-+      <property name="oo.dir" value="/usr/lib/libreoffice/program/classes" />
-+      <property name="ure.dir" value="/usr/lib/ure/share/java" />
 +      <property name="buildlib.dir" value="/usr/share/java" />
-       <property name="tests.dir" value="${src.dir}/tests" />
  
        <property name="osxbin.dir" value="osx" />
-@@ -102,33 +104,35 @@
-       <fileset id="jarsFileset" dir="${lib.dir}">
-               <include name="antlr.jar" />
--              <include name="antlr-3.4-complete.jar" />
--        <include name="jgoodies-common-1.4.0.jar" />
--              <include name="jgoodies-looks-2.5.2.jar" />
--              <include name="jgoodies-forms-1.6.0.jar" />
--              <include name="jayatana-1.2.4.jar" />
-+              <include name="antlr3.jar" />
-+              <include name="antlr3-runtime.jar" />
-+        <include name="jgoodies-common.jar" />
-+              <include name="jgoodies-looks.jar" />
-+              <include name="jgoodies-forms.jar" />
-               <include name="spin.jar" />
--              <include name="glazedlists-1.8.0_java15.jar" />
-+              <include name="glazedlists.jar" />
-               <include name="microba.jar" />
--              <include name="pdfbox-1.7.1.jar" />
--              <include name="jempbox-1.7.1.jar" />
--              <include name="fontbox-1.7.1.jar" />
-+              <include name="pdfbox.jar" />
-+              <include name="jempbox.jar" />
-+              <include name="fontbox.jar" />
-               <include name="zoom-java.jar" />
--      <include name="mysql-connector-java-5.0.7-bin.jar" />
--              <include name="postgresql-9.2-1002.jdbc4.jar" />
-+      <include name="mysql-connector-java.jar" />
-+              <include name="postgresql.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>
-     <!-- Openoffice connection dependencies. Compile-time only -->
--    <fileset id="ooFileset" dir="${lib.dir}">
--        <include name="oo/unoil.jar" />
--        <include name="oo/ridl.jar" />
--        <include name="oo/juh.jar" />
--        <include name="oo/jurt.jar" />
-+    <fileset id="ureFileset" dir="${ure.dir}">
-+        <include name="ridl.jar" />
-+        <include name="juh.jar" />
-+        <include name="jurt.jar" />
-+    </fileset>
-+    <fileset id="ooFileset" dir="${oo.dir}">
-+        <include name="unoil.jar" />
-     </fileset>
  
+@@ -98,11 +98,13 @@
      <!-- Done by MrDlib -->
-@@ -151,14 +155,15 @@
-         <!-- Done by MrDlib -->
-               <fileset refid="jarsFileset" />
-         <fileset refid="ooFileset" />
-+        <fileset refid="ureFileset" />
-       </path>
  
-       <!-- 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" />
+       <!-- Build classpath -->
+-      <filelist id="jars" />
++      <fileset id="jars" dir="${buildlib.dir}">
++              <include name="*.jar" />
++      </fileset>
+       <path id="classpath">
+               <pathelement path="${build.classes}" />
+               <pathelement path="${build.dir}" />
+-              <filelist refid="jars" />
++              <fileset refid="jars" />
        </path>
  
-       <!-- Classpath for tests -->
-@@ -238,7 +243,7 @@
+       <target name="run" depends="build">
+@@ -149,7 +151,7 @@
+               <copy file="${osxbin.dir}/MacAdapter.class" todir="${build.classes.osx}" />
        </target>
  
-       <!-- Jars up project -->
--      <target name="jars" depends="build, unjarlib">
-+      <target name="jars" depends="build">
+-      <target name="jars" depends="build, unjarlib" description="Jars up project">
++      <target name="jars" depends="build" description="Jars up project">
                <mkdir dir="${build.lib}" />
  
                <mkdir dir="${build.tmp}" />
-@@ -645,8 +650,6 @@
-               </jalopy>
-       </target>
+@@ -324,7 +326,7 @@
+       <target name="unjarlib" description="Unpacks jars from lib directory into temp directory">
+               <mkdir dir="${build.tmp}" />
+               <unjar dest="${build.tmp}">
+-                      <filelist refid="jars" />
++                      <fileset refid="jars" />
+               </unjar>
+               <!-- done by MrDlib -->
+               <delete includeEmptyDirs="true">
+@@ -519,8 +521,6 @@
+          Auxiliary targets
+         +++++++++++++++++++++++++++++++++++++++++++++++++-->
  
 -      <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
 -
-       <target name="compresssrc">
-               <!-- clone current repo into tmp dir. Reason: we want to have a clean src.zip, but do not want to execute "git clean -xdf" to allow developers having some temporary files (and user.properties) -->
-               <mkdir dir="${temp.dir}"/>
+       <macrodef name="compresssrc">
+         <attribute name="git-core-autocrlf" />
+         <attribute name="temp-dir" />