X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Fpatches%2Fuse-system-libs.diff;h=0ea303c2f9d8abd7f8789c87f1e26e4f199a7fd4;hb=4095cb0dd61a75b7b6b0bd811f8e803af5b27919;hp=e8ab2f75a5d55a2536a93416d06cf060b707f40c;hpb=8856c6d40ec13e44a7ed270bf49d688d5cff4cc4;p=debian%2Fopenrocket

diff --git a/debian/patches/use-system-libs.diff b/debian/patches/use-system-libs.diff
index e8ab2f75..0ea303c2 100644
--- a/debian/patches/use-system-libs.diff
+++ b/debian/patches/use-system-libs.diff
@@ -1,6 +1,7 @@
-diff -u -r a/build.xml b/build.xml
---- a/build.xml	2011-04-23 11:31:08.000408298 -0600
-+++ b/build.xml	2011-04-23 11:38:22.363543631 -0600
+diff --git a/core/build.xml b/core/build.xml
+index 0e57a6b..0a3c045 100644
+--- a/core/build.xml
++++ b/core/build.xml
 @@ -13,7 +13,6 @@
  	
  	<property name="classes.dir" value="${dist.dir}"/>	<!-- Directory for classes -->
@@ -32,12 +33,11 @@ diff -u -r a/build.xml b/build.xml
  	</path>
  	
  
-@@ -69,11 +73,9 @@
+@@ -68,11 +72,8 @@
  			<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/itext5.jar"/>
++				<attribute name="Class-Path" value="/usr/share/java/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /usr/share/java/itext5.jar"/>
  			</manifest>
 -			<zipfileset src="lib/miglayout15-swing.jar" />
 -			<zipfileset src="lib/jcommon-1.0.16.jar" />
@@ -46,16 +46,16 @@ diff -u -r a/build.xml b/build.xml
  		</jar>
  	</target>
  	
-@@ -89,7 +91,7 @@
- 			<fileset dir="." includes="*">
+@@ -88,7 +89,7 @@
+ 			<fileset dir="." includes="*" excludes="*.log">
  				<type type="file"/>
  			</fileset>
--			<fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/"/>
-+			<fileset dir="." includes="datafiles/ pix/ src/ test/"/>
+-			<fileset dir="." includes="resources/ lib/ lib-test/ src/ test/"/>
++			<fileset dir="." includes="resources/ src/ test/"/>
  		</copy>
  		<zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
  		<delete dir="${build.dir}/${pkgname}"/>
-@@ -213,4 +215,4 @@
+@@ -212,4 +213,4 @@ ${nonascii}</fail>
  		</echo>
   	</target>