X-Git-Url: https://git.toastfreeware.priv.at/debian/jabref.git/blobdiff_plain/e8ecbffe2585e23a304dec10f8250b0df2092310..4160fd99a22cd0a9f42033acf67e0066603f0e6b:/debian/patches/02_libs.patch?ds=sidebyside

diff --git a/debian/patches/02_libs.patch b/debian/patches/02_libs.patch
index 105a59a..f07376d 100644
--- a/debian/patches/02_libs.patch
+++ b/debian/patches/02_libs.patch
@@ -12,7 +12,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
  	<property name="tests.dir" value="${src.dir}/tests" />
  
  	<property name="nsis.executable" value="makensis.exe"/>
-@@ -107,22 +107,22 @@
+@@ -107,22 +107,21 @@
  
  	<fileset id="jarsFileset" dir="${lib.dir}">
  		<include name="antlr.jar" />
@@ -28,10 +28,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 -->
@@ -46,7 +46,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
  	</fileset>
  
  	<!-- Build classpath -->
-@@ -134,10 +134,10 @@
+@@ -134,10 +133,10 @@
  
  	<!-- Classpath for running the code generator -->
  	<path id="codegenerator">
@@ -57,11 +57,11 @@ 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 -->
-@@ -217,7 +217,7 @@
+@@ -217,7 +216,7 @@
  	</target>
  
  	<!-- Jars up project -->
@@ -70,7 +70,7 @@ 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 @@
+@@ -612,6 +611,6 @@
  		</jalopy>
  	</target>