debian/changelog

+king (2.23.161103+dfsg1-2) unstable; urgency=medium
+
+  * Remove unmappable character which spoils build with Java 9
+    Closes: #893222
+  * Standards-Version: 4.1.3
+  * debhelper 11
+
+ -- Andreas Tille <tille@debian.org>  Sun, 18 Mar 2018 06:47:27 +0100
+
 king (2.23.161103+dfsg1-1) unstable; urgency=medium
 
   * New upstream version

debian/compat

-10
+11

debian/control

@@ -3,13 +3,13 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.
 Uploaders: Andreas Tille <tille@debian.org>
 Section: java
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                default-jdk,
                javahelper,
                ant,
                libitext-java,
                libjogl2-java
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/king.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/king.git
 Homepage: http://kinemage.biochem.duke.edu/software/king.php

debian/patches/fix_suspicious_character.patch

+Description: Remove unmappable character which spoils build with Java 9
+Bug-Debian: https://bugs.debian.org/893222
+Author: Andreas Tille <tille@debian.org>
+Last-Update: Sat, 17 Mar 2018 22:54:02 +0100
+
+--- a/chiropraxis/src/chiropraxis/forcefield/GradientMinimizer.java
++++ b/chiropraxis/src/chiropraxis/forcefield/GradientMinimizer.java
+@@ -186,7 +186,7 @@ public class GradientMinimizer //extends
+             if(fb < fa) break;      // good -- we found a smaller point
+             else if(b < 1e-20)      // if min is at 0, Brent won't get closer than 1e-10 anyway
+             {
+-                // Testing |G| / (n) when n = number of variables is due to T. Schlick
++                // Testing |G| / (n) when n = number of variables is due to T. Schlick
+                 if(currGMag / Math.sqrt(path.length) < 1e-6*(1+Math.abs(fa)) || currGMag == prevGMag)
+                 {
+                     hitBottom = true;

debian/patches/java7-compat.patch

 Description: Fix FTBFS with Java7
- Java7 provides javax.swing.Painter, which makes "Painter" ambigious
+ Java7 provides javax.swing.Painter, which makes "Painter" ambiguous
  unless king.core.Painter is explcitly imported.
 
---- king-2.21.120420.orig/king/src/king/ToolBox.java
-+++ king-2.21.120420/king/src/king/ToolBox.java
+--- a/king/src/king/ToolBox.java
++++ b/king/src/king/ToolBox.java
 @@ -2,6 +2,7 @@
  //{{{ Package, imports
  package king;
@@ -12,8 +12,8 @@ Description: Fix FTBFS with Java7
  
  import java.awt.*;
  import java.awt.event.*;
---- king-2.21.120420.orig/king/src/king/ToolServices.java
-+++ king-2.21.120420/king/src/king/ToolServices.java
+--- a/king/src/king/ToolServices.java
++++ b/king/src/king/ToolServices.java
 @@ -2,6 +2,7 @@
  //{{{ Package, imports
  package king;
@@ -22,8 +22,8 @@ Description: Fix FTBFS with Java7
  import king.points.*;
  
  import java.awt.*;
---- king-2.21.120420.orig/king/src/king/BasicTool.java
-+++ king-2.21.120420/king/src/king/BasicTool.java
+--- a/king/src/king/BasicTool.java
++++ b/king/src/king/BasicTool.java
 @@ -2,6 +2,7 @@
  //{{{ Package, imports
  package king;
@@ -32,8 +32,8 @@ Description: Fix FTBFS with Java7
  
  import java.awt.*;
  import java.awt.event.*;
---- king-2.21.120420.orig/king/src/king/KinCanvas.java
-+++ king-2.21.120420/king/src/king/KinCanvas.java
+--- a/king/src/king/KinCanvas.java
++++ b/king/src/king/KinCanvas.java
 @@ -2,6 +2,7 @@
  //{{{ Package, imports
  package king;
@@ -42,8 +42,8 @@ Description: Fix FTBFS with Java7
  import king.painters.*;
  
  import java.awt.*;
---- king-2.21.120420.orig/king/src/king/tool/draw/DrawingTool.java
-+++ king-2.21.120420/king/src/king/tool/draw/DrawingTool.java
+--- a/king/src/king/tool/draw/DrawingTool.java
++++ b/king/src/king/tool/draw/DrawingTool.java
 @@ -3,6 +3,7 @@
  package king.tool.draw;
  import king.*;

debian/patches/series

@@ -3,3 +3,5 @@ java7-compat.patch
 ## use_jogl2.patch - fails to build
 ignore_appbundler.patch
 ignore_rdcvis.jar.patch
+fix_suspicious_character.patch
+# delete_mac_specific_file.patch # only needed for doc - see DEP3 header