From: Bdale Garbee <bdale@gag.com>
Date: Tue, 23 Mar 2010 01:49:52 +0000 (-0600)
Subject: update diff for new upstream version
X-Git-Tag: debian/1.1.0-1^2~6
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8aa1ff3b5c8331f0a2f0604a6c436e8517866f27;p=debian%2Fopenrocket

update diff for new upstream version
---

diff --git a/debian/patches/use-system-libs.diff b/debian/patches/use-system-libs.diff
index 24caa9d2..152a87a8 100644
--- a/debian/patches/use-system-libs.diff
+++ b/debian/patches/use-system-libs.diff
@@ -1,5 +1,5 @@
 diff --git a/build.xml b/build.xml
-index 394aea4..5915b1a 100644
+index 58155ea..8c4421b 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -13,7 +13,6 @@
@@ -10,7 +10,7 @@ index 394aea4..5915b1a 100644
  
  	<property name="pkgname"     value="${ant.project.name}-${build.version}"/>
  	
-@@ -28,16 +27,18 @@
+@@ -28,7 +27,10 @@
  	
  	<!-- Classpath definitions -->
  	<path id="classpath">
@@ -20,20 +20,19 @@ index 394aea4..5915b1a 100644
 +		<pathelement location="/usr/share/java/jfreechart.jar"/>
 +		<pathelement location="/usr/share/java/miglayout.jar"/>
  	</path>
--	
-+
+ 	
  	<path id="test-classpath">
- 		<path refid="classpath"/>
- 		<pathelement location="${basedir}"/>
+@@ -37,8 +39,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"/>
 +		<pathelement location="/usr/share/java/junit4.jar"/>
  	</path>
  	
  
-@@ -71,10 +72,8 @@
+@@ -72,10 +73,8 @@
  			<manifest>
  				<attribute name="Main-Class" value="${main-class}"/>
  				<attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
@@ -45,7 +44,7 @@ index 394aea4..5915b1a 100644
  		</jar>
  	</target>
  	
-@@ -90,7 +89,7 @@
+@@ -91,7 +90,7 @@
  			<fileset dir="." includes="*">
  				<type type="file"/>
  			</fileset>
@@ -54,7 +53,7 @@ index 394aea4..5915b1a 100644
  		</copy>
  		<zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
  		<delete dir="${build.dir}/${pkgname}"/>
-@@ -213,4 +212,4 @@ ${nonascii}</fail>
+@@ -215,4 +214,4 @@ ${nonascii}</fail>
  		</echo>
   	</target>