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

diff --git a/debian/patches/use-system-libs.diff b/debian/patches/use-system-libs.diff
index 45cf8bed..0ea303c2 100644
--- a/debian/patches/use-system-libs.diff
+++ b/debian/patches/use-system-libs.diff
@@ -1,7 +1,7 @@
-diff --git a/build.xml b/build.xml
-index 30f62d2..16ad504 100644
---- a/build.xml
-+++ b/build.xml
+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 -->
@@ -33,7 +33,7 @@ index 30f62d2..16ad504 100644
  	</path>
  	
  
-@@ -69,11 +73,8 @@
+@@ -68,11 +72,8 @@
  			<manifest>
  				<attribute name="Main-Class" value="${main-class}"/>
  				<attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
@@ -46,16 +46,16 @@ index 30f62d2..16ad504 100644
  		</jar>
  	</target>
  	
-@@ -89,7 +90,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 +214,4 @@ ${nonascii}</fail>
+@@ -212,4 +213,4 @@ ${nonascii}</fail>
  		</echo>
   	</target>