[f2j] 01/01: #873979: fix build on java 9

[Chris West]

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

faux-guest pushed a commit to branch master
in repository f2j.

commit 6820277df448372fd51c01889b0da71449fda32a
Author: Chris West (Faux) <git at goeswhere.com>
Date:   Mon Sep 18 17:53:35 2017 +0100

    #873979: fix build on java 9
---
 debian/changelog                          |  6 ++++++
 debian/patches/replace_printfformat.patch | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b4751ae..e254429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+f2j (0.8.1+dfsg-3) UNRELEASED; urgency=medium
+
+  * Change -source/-taregt to fix build on Java 9 (Closes: #873979).
+
+ -- Chris West (Faux) <debian at fau.xxx>  Mon, 18 Sep 2017 17:52:24 +0100
+
 f2j (0.8.1+dfsg-2) unstable; urgency=medium
 
   * cme fix dpkg-control
diff --git a/debian/patches/replace_printfformat.patch b/debian/patches/replace_printfformat.patch
index 4c4b74f..2a2def0 100644
--- a/debian/patches/replace_printfformat.patch
+++ b/debian/patches/replace_printfformat.patch
@@ -4,18 +4,18 @@ Description: Replace non-free class by Java standard String.format
 
 --- a/util/Makefile
 +++ b/util/Makefile
-@@ -5,7 +5,7 @@ JAR=jar
+@@ -5,7 +5,7 @@
  
  UTIL_JAR=f2jutil.jar
  
 -VER_TARGET=1.2
-+VER_TARGET=1.5
++VER_TARGET=1.8
  
  $(UTIL_JAR):
  	mkdir -p $(OUTDIR)
 --- a/util/org/j_paine/formatter/Formatter.java
 +++ b/util/org/j_paine/formatter/Formatter.java
-@@ -553,7 +553,7 @@ class FormatI extends FormatIOElement
+@@ -553,7 +553,7 @@
      /* Convert the number to a string. */
      if ( o instanceof Integer || o instanceof Long ) {
        String fmtstr = "%" + Integer.toString(getWidth()) + "d";
@@ -24,7 +24,7 @@ Description: Replace non-free class by Java standard String.format
  
        /* Throw an exception if the string won't fit. */
        if ( s.length() > getWidth() )
-@@ -745,7 +745,7 @@ class FormatF extends FormatIOElement
+@@ -745,7 +745,7 @@
           o instanceof Float || o instanceof Double ) {
        String fmtstr = "%" + Integer.toString(getWidth()) + "." + 
           Integer.toString(this.d) + "f";
@@ -33,7 +33,7 @@ Description: Replace non-free class by Java standard String.format
  
        /* Throw an exception if the string won't fit. */
        if ( s.length() > getWidth() )
-@@ -836,7 +836,7 @@ class FormatE extends FormatIOElement
+@@ -836,7 +836,7 @@
           o instanceof Float || o instanceof Double ) {
        String fmtstr = "%" + Integer.toString(getWidth()) + "." + 
           Integer.toString(this.d) + "E";

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