[jalview] 05/08: Fixed a compilation error with Java 8

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jalview.

commit 23fe84a07ca5f79eba80c8ac0eeb9d870d5c49c9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 12 14:13:43 2014 +0200

    Fixed a compilation error with Java 8
---
 debian/changelog                         |  2 ++
 debian/patches/java8-compatibility.patch | 20 ++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index de1d6ad..44d7d37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 jalview (2.7.dfsg-4) UNRELEASED; urgency=low
 
+  * Team upload
+  * Fixed a compilation error with Java 8 (Closes: #750746)
   * Removed the unused build dependency on libgnujaf-java
   * Updated Standards-Version to 3.9.5 (no changes)
   * Moved the package to Git
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
new file mode 100644
index 0000000..54a4957
--- /dev/null
+++ b/debian/patches/java8-compatibility.patch
@@ -0,0 +1,20 @@
+Description: Fix the compilation errors with Java 8
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/jalview/ws/rest/InputType.java
++++ b/src/jalview/ws/rest/InputType.java
+@@ -42,7 +42,6 @@
+ import org.apache.http.entity.mime.content.ContentBody;
+ import org.apache.http.entity.mime.content.StringBody;
+ 
+-import sun.io.CharacterEncoding;
+ import sun.misc.CharacterEncoder;
+ 
+ /***
+@@ -263,4 +262,4 @@
+     return new Option(name,descr, req, defType==null ? "" : defType.toString(), curType==null ? "" : curType.toString(),molType.toStringValues(),
+             null);
+   }
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index 3ee1d17..e7ff9d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 mutilate-build-system.diff
 newer-jmol-api.diff
 newer-mime4j-api.diff
+java8-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jalview.git