[med-svn] [Git][med-team/king][master] 6 commits: Remove unmappable character which spoils build with Java 9

Andreas Tille gitlab at salsa.debian.org
Sun Mar 18 06:31:13 UTC 2018 

Andreas Tille pushed to branch master at Debian Med / king


Commits:
95f32950 by Andreas Tille at 2018-03-18T06:45:25+01:00
Remove unmappable character which spoils build with Java 9

- - - - -
965cfc4e by Andreas Tille at 2018-03-18T06:45:45+01:00
Standards-Version: 4.1.3

- - - - -
fff9a0a7 by Andreas Tille at 2018-03-18T06:46:08+01:00
debhelper 11

- - - - -
e1bfeac4 by Andreas Tille at 2018-03-18T07:01:31+01:00
Fix patch

- - - - -
3a4d5f59 by Andreas Tille at 2018-03-18T07:16:16+01:00
Fix lintian issues in patch series

- - - - -
ecabed7d by Andreas Tille at 2018-03-18T07:31:01+01:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/fix_suspicious_character.patch
- debian/patches/java7-compat.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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 at debian.org>  Sun, 18 Mar 2018 06:47:27 +0100
+
 king (2.23.161103+dfsg1-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at 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
=====================================
--- /dev/null
+++ b/debian/patches/fix_suspicious_character.patch
@@ -0,0 +1,16 @@
+Description: Remove unmappable character which spoils build with Java 9
+Bug-Debian: https://bugs.debian.org/893222
+Author: Andreas Tille <tille at 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
=====================================
--- a/debian/patches/java7-compat.patch
+++ b/debian/patches/java7-compat.patch
@@ -1,9 +1,9 @@
 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
=====================================
--- a/debian/patches/series
+++ b/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



View it on GitLab: https://salsa.debian.org/med-team/king/compare/0605e2e5e3b74eb82d8c710c65eea7119dc54e18...ecabed7d43150d3deabd4412520f8c70b867f23b

---
View it on GitLab: https://salsa.debian.org/med-team/king/compare/0605e2e5e3b74eb82d8c710c65eea7119dc54e18...ecabed7d43150d3deabd4412520f8c70b867f23b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180318/40e8f46d/attachment-0001.html>

More information about the debian-med-commit mailing list