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
@@ -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" />
 
 	<property name="nsis.executable" value="makensis.exe"/>
@@ -107,22 +107,22 @@
 
 	<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>
 
 	<!-- Build classpath -->
@@ -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>
 
 	<!-- Classpath for tests -->
@@ -217,7 +217,7 @@
 	</target>
 
 	<!-- Jars up project -->
-	<target name="jars" depends="build, unjarlib">
+	<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>