First new (build) dependencies added: antlr3-runtime, jna.
[debian/jabref.git] / debian / patches / debian_libs.patch
index 22a7a597c61e75cc011cd36ec96311e00d42fa29..8246968ed480f7e614884f4ac10f91b094931b23 100644 (file)
@@ -1,20 +1,26 @@
-Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
-Author: Philip Rinn <rinni@gmx.net>
 Description: Use debian libraries and disable unnecesary unjarlib target,
 Description: Use debian libraries and disable unnecesary unjarlib target,
+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: 2015-05-19
+
 --- a/build.xml
 +++ b/build.xml
 --- a/build.xml
 +++ b/build.xml
-@@ -75,7 +75,9 @@
-       <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" />
+@@ -71,8 +71,10 @@
+       <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="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="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="buildlib" />
-       <property name="tests.dir" value="${src.dir}/tests" />
++      <property name="buildlib.dir" value="/usr/share/java" />
  
  
-@@ -100,33 +102,35 @@
+       <property name="osxbin.dir" value="osx" />
+@@ -96,36 +98,38 @@
  
        <fileset id="jarsFileset" dir="${lib.dir}">
                <include name="antlr.jar" />
  
        <fileset id="jarsFileset" dir="${lib.dir}">
                <include name="antlr.jar" />
@@ -22,12 +28,16 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
 -        <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="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="antlr3.jar" />
 +              <include name="antlr3-runtime.jar" />
 +        <include name="jgoodies-common.jar" />
 +              <include name="jgoodies-looks.jar" />
 +              <include name="jgoodies-forms.jar" />
+         <include name="jgoodies/jgoodies-uif-lite.jar" />
+-        <include name="jna-4.1.0.jar" />
++        <include name="jna.jar" />
+         <include name="ritopt/ritopt-0.2.1-bin.jar" />
+-              <include name="jayatana-1.2.4.jar" />
                <include name="spin.jar" />
 -              <include name="glazedlists-1.8.0_java15.jar" />
 +              <include name="glazedlists.jar" />
                <include name="spin.jar" />
 -              <include name="glazedlists-1.8.0_java15.jar" />
 +              <include name="glazedlists.jar" />
@@ -70,39 +80,29 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
      </fileset>
  
      <!-- Done by MrDlib -->
      </fileset>
  
      <!-- Done by MrDlib -->
-@@ -149,14 +153,15 @@
+@@ -146,6 +150,7 @@
          <!-- Done by MrDlib -->
                <fileset refid="jarsFileset" />
          <fileset refid="ooFileset" />
 +        <fileset refid="ureFileset" />
        </path>
  
          <!-- 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" />
-       </path>
-       <!-- Classpath for tests -->
-@@ -237,7 +242,7 @@
+       <target name="run" depends="build">
+@@ -188,7 +193,7 @@
        </target>
  
        <!-- Jars up project -->
 -      <target name="jars" depends="build, unjarlib">
 +      <target name="jars" depends="build">
                <mkdir dir="${build.lib}" />
        </target>
  
        <!-- Jars up project -->
 -      <target name="jars" depends="build, unjarlib">
 +      <target name="jars" depends="build">
                <mkdir dir="${build.lib}" />
-         
                <mkdir dir="${build.tmp}" />
                <mkdir dir="${build.tmp}" />
-@@ -595,6 +600,4 @@
-               </jalopy>
-       </target>
+@@ -510,8 +515,6 @@
+          Auxiliary targets
+         +++++++++++++++++++++++++++++++++++++++++++++++++-->
  
 -      <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
 -
  
 -      <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
 -
- </project>
+       <macrodef name="compresssrc">
+         <attribute name="git-core-autocrlf" />
+         <attribute name="temp-dir" />