From: Bdale Garbee <bdale@gag.com>
Date: Wed, 9 Mar 2011 04:52:27 +0000 (-0700)
Subject: update to reflect additional build dependency
X-Git-Tag: debian/1.1.4-1~12
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=71dc2947c5110b2c2aba80cd092a2447310dddba;p=debian%2Fopenrocket

update to reflect additional build dependency
---

diff --git a/build.xml b/build.xml
index 30f62d25..3482ffec 100644
--- a/build.xml
+++ b/build.xml
@@ -13,7 +13,6 @@
 	
 	<property name="classes.dir" value="${dist.dir}"/>	<!-- Directory for classes -->
 	<property name="jar.dir"     value="${build.dir}/jar"/>	<!-- Directory for built jar's -->
-	<property name="lib.dir"     value="lib"/>				<!-- Library source directory -->
 
 	<property name="pkgname"     value="${ant.project.name}-${build.version}"/>
 	
@@ -27,7 +26,10 @@
 	
 	<!-- Classpath definitions -->
 	<path id="classpath">
-		<fileset dir="${lib.dir}" includes="**/*.jar"/>
+		<!-- update manifest class-path definition below too when making changes here -->
+		<pathelement location="/usr/share/java/jcommon.jar"/>
+		<pathelement location="/usr/share/java/jfreechart.jar"/>
+		<pathelement location="/usr/share/java/miglayout.jar"/>
 	</path>
 	
 	<path id="test-classpath">
@@ -36,7 +38,7 @@
 		<pathelement location="${build-test.dir}"/>
 		<pathelement location="${classes.dir}"/>
 		<pathelement location="${src-test.dir}"/>
-		<fileset dir="lib-test/" includes="*.jar"/>
+		<pathelement location="/usr/share/java/junit4.jar"/>
 	</path>
 	
 
@@ -69,11 +71,9 @@
 			<manifest>
 				<attribute name="Main-Class" value="${main-class}"/>
 				<attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
+				<attribute name="Class-Path" value="/usr/share/j
+ava/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /usr/share/java/itext.jar"/>
 			</manifest>
-			<zipfileset src="lib/miglayout15-swing.jar" />
-			<zipfileset src="lib/jcommon-1.0.16.jar" />
-			<zipfileset src="lib/jfreechart-1.0.13.jar" />
-			<zipfileset src="lib/iText-5.0.2.jar" />
 		</jar>
 	</target>
 	
@@ -89,7 +89,7 @@
 			<fileset dir="." includes="*">
 				<type type="file"/>
 			</fileset>
-			<fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/"/>
+			<fileset dir="." includes="datafiles/ pix/ src/ test/"/>
 		</copy>
 		<zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
 		<delete dir="${build.dir}/${pkgname}"/>
@@ -213,4 +213,4 @@ ${nonascii}</fail>
 		</echo>
  	</target>
     
-</project>
\ No newline at end of file
+</project>
diff --git a/debian/control b/debian/control
index b9c94c80..adf854a1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openrocket
 Section: science
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
-Build-Depends: debhelper (>= 7.0.50~), openjdk-6-jdk, ant, ant-optional, libjcommon-java, libjfreechart-java, libmiglayout-java, junit4
+Build-Depends: debhelper (>= 7.0.50~), openjdk-6-jdk, ant, ant-optional, libjcommon-java, libjfreechart-java, libmiglayout-java, junit4, libitext-java
 Standards-Version: 3.9.1
 Homepage: http://openrocket.sourceforge.net/
 Vcs-Git: git://git.gag.com/debian/openrocket
diff --git a/lib/iText-5.0.2.jar b/lib/iText-5.0.2.jar
deleted file mode 100644
index ed956531..00000000
Binary files a/lib/iText-5.0.2.jar and /dev/null differ