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

diff --git a/debian/patches/use-system-libs.diff b/debian/patches/use-system-libs.diff
index 2e399544..0ea303c2 100644
--- a/debian/patches/use-system-libs.diff
+++ b/debian/patches/use-system-libs.diff
@@ -1,5 +1,7 @@
---- old/build.xml	2011-03-05 13:28:54.000000000 -0700
-+++ new/build.xml	2011-03-08 21:53:31.781302342 -0700
+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 -->
@@ -8,19 +10,21 @@
  
  	<property name="pkgname"     value="${ant.project.name}-${build.version}"/>
  	
-@@ -27,7 +26,10 @@
+@@ -27,7 +26,12 @@
  	
  	<!-- 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/itext5.jar"/>
 +		<pathelement location="/usr/share/java/jcommon.jar"/>
 +		<pathelement location="/usr/share/java/jfreechart.jar"/>
++		<pathelement location="/usr/share/java/jmock2.jar"/>
 +		<pathelement location="/usr/share/java/miglayout.jar"/>
  	</path>
  	
  	<path id="test-classpath">
-@@ -36,7 +38,7 @@
+@@ -36,7 +40,7 @@
  		<pathelement location="${build-test.dir}"/>
  		<pathelement location="${classes.dir}"/>
  		<pathelement location="${src-test.dir}"/>
@@ -29,12 +33,11 @@
  	</path>
  	
  
-@@ -69,11 +71,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" />
@@ -43,16 +46,16 @@
  		</jar>
  	</target>
  	
-@@ -89,7 +89,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 +213,4 @@
+@@ -212,4 +213,4 @@ ${nonascii}</fail>
  		</echo>
   	</target>