update patch
authorBdale Garbee <bdale@gag.com>
Wed, 9 Mar 2011 04:54:55 +0000 (21:54 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 9 Mar 2011 04:54:55 +0000 (21:54 -0700)
debian/patches/use-system-libs.diff

index 152a87a886120a64d39e02030268a7c242900a8d..1f857bddf4a88c8e1a0d38373de3e76fe3dd5ad5 100644 (file)
@@ -1,7 +1,5 @@
-diff --git a/build.xml b/build.xml
-index 58155ea..8c4421b 100644
---- a/build.xml
-+++ b/build.xml
+--- build.xml  2011-03-05 13:28:54.000000000 -0700
++++ /tmp/build.xml     2011-03-08 21:53:31.781302342 -0700
 @@ -13,7 +13,6 @@
        
        <property name="classes.dir" value="${dist.dir}"/>      <!-- Directory for classes -->
@@ -10,7 +8,7 @@ index 58155ea..8c4421b 100644
  
        <property name="pkgname"     value="${ant.project.name}-${build.version}"/>
        
-@@ -28,7 +27,10 @@
+@@ -27,7 +26,10 @@
        
        <!-- Classpath definitions -->
        <path id="classpath">
@@ -22,29 +20,30 @@ index 58155ea..8c4421b 100644
        </path>
        
        <path id="test-classpath">
-@@ -37,8 +39,7 @@
+@@ -36,7 +38,7 @@
                <pathelement location="${build-test.dir}"/>
                <pathelement location="${classes.dir}"/>
                <pathelement location="${src-test.dir}"/>
--<!--          <pathelement location="${ant.library.dir}/junit4.jar"/> -->
--              <pathelement location="lib-test/junit-4.7.jar"/>
+-              <fileset dir="lib-test/" includes="*.jar"/>
 +              <pathelement location="/usr/share/java/junit4.jar"/>
        </path>
        
  
-@@ -72,10 +73,8 @@
+@@ -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/java/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar"/>
++                              <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>
        
-@@ -91,7 +90,7 @@
+@@ -89,7 +89,7 @@
                        <fileset dir="." includes="*">
                                <type type="file"/>
                        </fileset>
@@ -53,7 +52,7 @@ index 58155ea..8c4421b 100644
                </copy>
                <zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
                <delete dir="${build.dir}/${pkgname}"/>
-@@ -215,4 +214,4 @@ ${nonascii}</fail>
+@@ -213,4 +213,4 @@
                </echo>
        </target>