From: Bdale Garbee <bdale@gag.com>
Date: Mon, 2 May 2011 23:40:41 +0000 (-0600)
Subject: fix broken patch
X-Git-Tag: debian/1.1.4-1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=1cf47366867717b8704d37a8cb28b0d5645c0d29;hp=505d4f7f2f851cc3ca0744ae9dfa50fa73e0fbf9;p=debian%2Fopenrocket

fix broken patch
---

diff --git a/debian/patches/use-system-libs.diff b/debian/patches/use-system-libs.diff
index e8ab2f75..45cf8bed 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/build.xml b/build.xml
+index 30f62d2..16ad504 100644
+--- a/build.xml
++++ b/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 @@
+@@ -69,11 +73,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,7 +46,7 @@ diff -u -r a/build.xml b/build.xml
  		</jar>
  	</target>
  	
-@@ -89,7 +91,7 @@
+@@ -89,7 +90,7 @@
  			<fileset dir="." includes="*">
  				<type type="file"/>
  			</fileset>
@@ -55,7 +55,7 @@ diff -u -r a/build.xml b/build.xml
  		</copy>
  		<zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
  		<delete dir="${build.dir}/${pkgname}"/>
-@@ -213,4 +215,4 @@
+@@ -213,4 +214,4 @@ ${nonascii}</fail>
  		</echo>
   	</target>