From: Bdale Garbee <bdale@gag.com>
Date: Mon, 22 Mar 2010 22:52:09 +0000 (-0600)
Subject: give up on being cute and brute-force manifest class path definition
X-Git-Tag: debian/1.0.0-1~4
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=0406475de8773dbcad299ffb3bb6cff7ba4b4e6f;p=debian%2Fopenrocket

give up on being cute and brute-force manifest class path definition
---

diff --git a/debian/patches/use-system-libs.diff b/debian/patches/use-system-libs.diff
index 32e1d8bc..5ea50399 100644
--- a/debian/patches/use-system-libs.diff
+++ b/debian/patches/use-system-libs.diff
@@ -1,5 +1,5 @@
 diff --git a/build.xml b/build.xml
-index 394aea4..acfdd86 100644
+index 394aea4..d420c52 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -28,9 +28,12 @@
@@ -7,12 +7,12 @@ index 394aea4..acfdd86 100644
  	<!-- 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>
 -	
-+	<property name="debianclasspath" refid="classpath"/>
 +
  	<path id="test-classpath">
  		<path refid="classpath"/>
@@ -21,7 +21,7 @@ index 394aea4..acfdd86 100644
  			<manifest>
  				<attribute name="Main-Class" value="${main-class}"/>
  				<attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
-+				<attribute name="Class-Path" value="${debianclasspath}"/>
++				<attribute name="Class-Path" value="/usr/share/java/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar"/>
  			</manifest>
 -			<zipfileset src="lib/miglayout15-swing.jar" />
 -			<zipfileset src="lib/jcommon-1.0.16.jar" />