[med-svn] [mesquite] 02/04: Try to replace third party jars by Debian ones

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository mesquite.

commit ac347bb0cebc1e5097c517c761bf3dc9f0f97f22
Author: Andreas Tille <tille at debian.org>
Date:   Sat May 21 11:48:00 2016 +0200

    Try to replace third party jars by Debian ones
---
 debian/patches/do_not_import_apple_jar.patch | 10 ++++++++++
 debian/patches/path_to_jars.patch            | 20 ++++++++++++++++++++
 debian/patches/series                        |  2 ++
 3 files changed, 32 insertions(+)

diff --git a/debian/patches/do_not_import_apple_jar.patch b/debian/patches/do_not_import_apple_jar.patch
new file mode 100644
index 0000000..e5bcc23
--- /dev/null
+++ b/debian/patches/do_not_import_apple_jar.patch
@@ -0,0 +1,10 @@
+--- a/Source/mesquite/lib/MesquiteFile.java
++++ b/Source/mesquite/lib/MesquiteFile.java
+@@ -17,7 +17,6 @@ import java.awt.*;
+ import java.io.*;
+ import java.net.*;
+ import java.util.*;
+-import com.apple.mrj.*;
+ import javax.swing.*;
+ 
+ /* ======================================================================== */
diff --git a/debian/patches/path_to_jars.patch b/debian/patches/path_to_jars.patch
new file mode 100644
index 0000000..b1ad09c
--- /dev/null
+++ b/debian/patches/path_to_jars.patch
@@ -0,0 +1,20 @@
+--- a/.classpath
++++ b/.classpath
+@@ -1,14 +1,14 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <classpath>
+ 	<classpathentry exported="true" kind="lib" path="jars/AppleJavaExtensions.jar"/>
+-	<classpathentry exported="true" kind="lib" path="jars/iText.jar"/>
++	<classpathentry exported="true" kind="lib" path="/usr/share/java/itext1.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="jars/Jama-1.0.1.zip"/>
+ 	<classpathentry exported="true" kind="lib" path="jars/JSci.zip"/>
+ 	<classpathentry exported="true" kind="lib" path="jars/MRJToolkitStubs.zip"/>
+ 	<classpathentry exported="true" kind="lib" path="jars/pal.zip"/>
+-	<classpathentry exported="true" kind="lib" path="jars/commons-httpclient-3.1.jar"/>
++	<classpathentry exported="true" kind="lib" path="/usr/share/java/commons-httpclient.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="jars/dom4j-1.6.1.jar"/>
+-	<classpathentry exported="true" kind="lib" path="jars/commons-lang-2.3.jar"/>
++	<classpathentry exported="true" kind="lib" path="/usr/share/java/commons-lang.jar"/>
+ 	<classpathentry excluding="docs/mesquite/BeanTree/" kind="src" path="Resources"/>
+ 	<classpathentry kind="src" path="Source"/>
+ 	<classpathentry kind="lib" path="jars/commons-codec-1.6.jar"/>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ed8fb2c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+path_to_jars.patch
+do_not_import_apple_jar.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mesquite.git