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

diff --git a/debian/patches/use-system-libs.diff b/debian/patches/use-system-libs.diff
index 152a87a8..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 58155ea..8c4421b 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 -->
@@ -10,50 +10,52 @@ index 58155ea..8c4421b 100644
  
  	<property name="pkgname"     value="${ant.project.name}-${build.version}"/>
  	
-@@ -28,7 +27,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">
-@@ -37,8 +39,7 @@
+@@ -36,7 +40,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 @@
+@@ -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/java/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.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" />
 -			<zipfileset src="lib/jfreechart-1.0.13.jar" />
+-			<zipfileset src="lib/iText-5.0.2.jar" />
  		</jar>
  	</target>
  	
-@@ -91,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}"/>
-@@ -215,4 +214,4 @@ ${nonascii}</fail>
+@@ -212,4 +213,4 @@ ${nonascii}</fail>
  		</echo>
   	</target>