From: Bdale Garbee <bdale@gag.com>
Date: Mon, 22 Mar 2010 20:58:37 +0000 (-0600)
Subject: try to use system libraries instead of delivering local copies
X-Git-Tag: debian/1.0.0-1~9
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=e15c952dfd37410a8499e0a2f10c7fcd4750c4cd;p=debian%2Fopenrocket

try to use system libraries instead of delivering local copies
---

diff --git a/debian/control b/debian/control
index 86dce566..821d626a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: git://git.gag.com/debian/openrocket
 
 Package: openrocket
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre, libjcommon-java, libjfreechart-java, libmiglayout-java
 Description: Model Rocket Simulator
  OpenRocket is a free, fully featured model rocket simulator that allows 
  you to design and simulate your rockets before actually building and 
diff --git a/debian/patches/series b/debian/patches/series
index a23bfdd9..90e3f123 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 openjdk-is-ok.diff
+use-system-libs.diff
diff --git a/debian/patches/use-system-libs.diff b/debian/patches/use-system-libs.diff
new file mode 100644
index 00000000..e06e4736
--- /dev/null
+++ b/debian/patches/use-system-libs.diff
@@ -0,0 +1,21 @@
+diff --git a/build.xml b/build.xml
+index 394aea4..46fdeff 100644
+--- a/build.xml
++++ b/build.xml
+@@ -72,9 +72,6 @@
+ 				<attribute name="Main-Class" value="${main-class}"/>
+ 				<attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
+ 			</manifest>
+-			<zipfileset src="lib/miglayout15-swing.jar" />
+-			<zipfileset src="lib/jcommon-1.0.16.jar" />
+-			<zipfileset src="lib/jfreechart-1.0.13.jar" />
+ 		</jar>
+ 	</target>
+ 	
+@@ -213,4 +210,4 @@ ${nonascii}</fail>
+ 		</echo>
+  	</target>
+     
+-</project>
+\ No newline at end of file
++</project>