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:
b19c830
)
another build dep
author
Bdale Garbee
<bdale@gag.com>
Sat, 23 Apr 2011 17:39:08 +0000
(11:39 -0600)
committer
Bdale Garbee
<bdale@gag.com>
Sat, 23 Apr 2011 17:39:08 +0000
(11:39 -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 842b2f62821a909ed2ce472b2ad4677bdc8bb378..e8ab2f75a5d55a2536a93416d06cf060b707f40c 100644
(file)
--- a/
debian/patches/use-system-libs.diff
+++ b/
debian/patches/use-system-libs.diff
@@
-1,5
+1,6
@@
+diff -u -r a/build.xml b/build.xml
--- a/build.xml 2011-04-23 11:31:08.000408298 -0600
--- a/build.xml 2011-04-23 11:31:08.000408298 -0600
-+++ b/build.xml 2011-04-23 11:3
0:57.881335056
-0600
++++ b/build.xml 2011-04-23 11:3
8:22.363543631
-0600
@@ -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 -->
@@
-8,7
+9,7
@@
<property name="pkgname" value="${ant.project.name}-${build.version}"/>
<property name="pkgname" value="${ant.project.name}-${build.version}"/>
-@@ -27,7 +26,1
1
@@
+@@ -27,7 +26,1
2
@@
<!-- Classpath definitions -->
<path id="classpath">
<!-- Classpath definitions -->
<path id="classpath">
@@
-17,11
+18,12
@@
+ <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/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">
+ <pathelement location="/usr/share/java/miglayout.jar"/>
</path>
<path id="test-classpath">
-@@ -36,7 +
39
,7 @@
+@@ -36,7 +
40
,7 @@
<pathelement location="${build-test.dir}"/>
<pathelement location="${classes.dir}"/>
<pathelement location="${src-test.dir}"/>
<pathelement location="${build-test.dir}"/>
<pathelement location="${classes.dir}"/>
<pathelement location="${src-test.dir}"/>
@@
-30,7
+32,7
@@
</path>
</path>
-@@ -69,11 +7
2
,9 @@
+@@ -69,11 +7
3
,9 @@
<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"/>
@@
-44,7
+46,7
@@
</jar>
</target>
</jar>
</target>
-@@ -89,7 +9
0
,7 @@
+@@ -89,7 +9
1
,7 @@
<fileset dir="." includes="*">
<type type="file"/>
</fileset>
<fileset dir="." includes="*">
<type type="file"/>
</fileset>
@@
-53,7
+55,7
@@
</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
4
,4 @@
+@@ -213,4 +21
5
,4 @@
</echo>
</target>
</echo>
</target>