projects
/
debian
/
openrocket
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
64bb077
)
update patch
author
Bdale Garbee
<bdale@gag.com>
Sun, 18 Mar 2012 20:17:15 +0000
(21:17 +0100)
committer
Bdale Garbee
<bdale@gag.com>
Sun, 18 Mar 2012 20:17:15 +0000
(21:17 +0100)
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 63791af2a5eadf5c11b9e4465bc001707789d826..0ea303c2f9d8abd7f8789c87f1e26e4f199a7fd4 100644
(file)
--- a/
debian/patches/use-system-libs.diff
+++ b/
debian/patches/use-system-libs.diff
@@
-1,5
+1,5
@@
diff --git a/core/build.xml b/core/build.xml
diff --git a/core/build.xml b/core/build.xml
-index 0e
be470..fc12040
100644
+index 0e
57a6b..0a3c045
100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -13,7 +13,6 @@
--- a/core/build.xml
+++ b/core/build.xml
@@ -13,7 +13,6 @@
@@
-33,7
+33,7
@@
index 0ebe470..fc12040 100644
</path>
</path>
-@@ -
70,11 +74
,8 @@
+@@ -
68,11 +72
,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"/>
@@
-46,16
+46,16
@@
index 0ebe470..fc12040 100644
</jar>
</target>
</jar>
</target>
-@@ -
90,7 +91
,7 @@
+@@ -
88,7 +89
,7 @@
<fileset dir="." includes="*" excludes="*.log">
<type type="file"/>
</fileset>
<fileset dir="." includes="*" excludes="*.log">
<type type="file"/>
</fileset>
-- <fileset dir="." includes="
datafiles/ lib/ lib-test/ pix/ src/ test/ l10n
/"/>
-+ <fileset dir="." includes="
datafiles/ pix/ src/ test/ l10n
/"/>
+- <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}"/>
</copy>
<zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
<delete dir="${build.dir}/${pkgname}"/>
-@@ -21
4,4 +215
,4 @@ ${nonascii}</fail>
+@@ -21
2,4 +213
,4 @@ ${nonascii}</fail>
</echo>
</target>
</echo>
</target>