releasing version 2.7~beta1+ds-5

[debian/jabref.git] / debian / patches / 02_libs.patch

diff --git a/debian/patches/02_libs.patch b/debian/patches/02_libs.patch
index 105a59aba819c04fce0aa45f935c3a76aa87c1e2..063c85e54d0ca3c1de9e7c966b501db905f8b84e 100644 (file)
--- a/debian/patches/02_libs.patch
+++ b/debian/patches/02_libs.patch
@@ -17,9 +17,10 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
        <fileset id="jarsFileset" dir="${lib.dir}">
                <include name="antlr.jar" />
 -              <include name="antlr-3.0b5.jar" />
--              <include name="looks-2.2.0.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" />
@@ -28,10 +29,10 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
                <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="zoom-java.jar" />
--      <include name="mysql-connector-java-5.0.7-bin.jar" />
 +      <include name="mysql-connector-java.jar" />
          <!--<include name="substance-4.1.jar" />-->
          <!-- Plugin runtime dependencies -->
@@ -57,7 +58,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
 +              <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
 +              <pathelement location="${lib.dir}/jpf.jar" />
 +              <pathelement location="${lib.dir}/jpf-boot.jar" />
-+              <pathelement location="${lib.dir}/velocity-dep-1.5.jar" />
++              <pathelement location="${lib.dir}/velocity.jar" />
        </path>
  
        <!-- Classpath for tests -->
@@ -70,11 +71,10 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
                <mkdir dir="${build.lib}" />
                <mkdir dir="${build.tmp}" />
                <jar destfile="${build.lib}/${build.jar}">
-@@ -612,6 +612,6 @@
+@@ -623,6 +623,4 @@ Number (CCN)           maintenance
                </jalopy>
        </target>
  
--      <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
-+<!--  <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" /> -->
- 
+-      <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.1.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
+-
  </project>