give up on being cute and brute-force manifest class path definition
authorBdale Garbee <bdale@gag.com>
Mon, 22 Mar 2010 22:52:09 +0000 (16:52 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 22 Mar 2010 22:52:09 +0000 (16:52 -0600)
debian/patches/use-system-libs.diff

index 32e1d8bc85b636c3aed44d537bb78052d9e2f583..5ea503994dca819719f86c7c6fb4f023de95bfef 100644 (file)
@@ -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" />