projects
/
debian
/
openrocket
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
505d4f7
)
fix broken patch
author
Bdale Garbee
<bdale@gag.com>
Mon, 2 May 2011 23:40:41 +0000
(17:40 -0600)
committer
Bdale Garbee
<bdale@gag.com>
Mon, 2 May 2011 23:40:41 +0000
(17:40 -0600)
debian/patches/use-system-libs.diff
patch
|
blob
|
history
diff --git
a/debian/patches/use-system-libs.diff
b/debian/patches/use-system-libs.diff
index e8ab2f75a5d55a2536a93416d06cf060b707f40c..45cf8bed1c8e5a1e8479d96e5f69ede31c6dedc3 100644
(file)
--- 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 -->
@@ -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>
</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"/>
<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" />
</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>
</jar>
</target>
-@@ -89,7 +9
1
,7 @@
+@@ -89,7 +9
0
,7 @@
<fileset dir="." includes="*">
<type type="file"/>
</fileset>
<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}"/>
</copy>
<zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
<delete dir="${build.dir}/${pkgname}"/>
-@@ -213,4 +21
5,4 @@
+@@ -213,4 +21
4,4 @@ ${nonascii}</fail>
</echo>
</target>
</echo>
</target>