From: Bdale Garbee <bdale@gag.com>
Date: Wed, 8 Sep 2010 03:10:05 +0000 (-0600)
Subject: openjdk test seems compatible with Debian now
X-Git-Tag: debian/1.1.2-1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=50e742da8607beed36d641cf220c4544c9f52a3f;hp=bdf9a4cf26254073b1f3ffc605cbc0788bdcfc59;p=debian%2Fopenrocket

openjdk test seems compatible with Debian now
---

diff --git a/debian/patches/openjdk-is-ok.diff b/debian/patches/openjdk-is-ok.diff
deleted file mode 100644
index 3500965b..00000000
--- a/debian/patches/openjdk-is-ok.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/net/sf/openrocket/startup/Startup.java b/src/net/sf/openrocket/startup/Startup.java
-index 0439185..3e7a71a 100644
---- a/src/net/sf/openrocket/startup/Startup.java
-+++ b/src/net/sf/openrocket/startup/Startup.java
-@@ -29,7 +29,8 @@ public class Startup {
- 		
- 		checkVersion();
- 		checkHead();
--		checkOpenJDK();
-+		// seems to work to me .. let's not hassle users .. Bdale
-+		// checkOpenJDK();
- 		
- 		// Load and execute START_CLASS
- 		try {
diff --git a/debian/patches/series b/debian/patches/series
index dd53df8f..069179fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 debian-build.source.diff
-openjdk-is-ok.diff
 use-system-libs.diff