Package: king Version: 2.21.120420-1 Severity: important Tags: patch User: [email protected] Usertags: openjdk-7-transition
Hi, King FTBFS with Java7 because the use of "Painter" is ambigous when using imports like: import king.core.*; import javax.swing.*; A possible solution is to explicitly import king.core.Painter and an example patch is included, which solves this issue. ~Niels
diff -Nru king-2.21.120420/debian/changelog king-2.21.120420/debian/changelog --- king-2.21.120420/debian/changelog 2012-05-21 21:33:52.000000000 +0200 +++ king-2.21.120420/debian/changelog 2012-06-23 15:46:34.000000000 +0200 @@ -1,3 +1,10 @@ +king (2.21.120420-1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with Java7. + + -- Niels Thykier <[email protected]> Sat, 23 Jun 2012 15:46:25 +0200 + king (2.21.120420-1) unstable; urgency=low * New upstream version diff -Nru king-2.21.120420/debian/patches/java7-compat.patch king-2.21.120420/debian/patches/java7-compat.patch --- king-2.21.120420/debian/patches/java7-compat.patch 1970-01-01 01:00:00.000000000 +0100 +++ king-2.21.120420/debian/patches/java7-compat.patch 2012-06-23 15:52:19.000000000 +0200 @@ -0,0 +1,54 @@ +Description: Fix FTBFS with Java7 + Java7 provides javax.swing.Painter, which makes "Painter" ambigious + 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 +@@ -2,6 +2,7 @@ + //{{{ Package, imports + package king; + import king.core.*; ++import king.core.Painter; + + 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 +@@ -2,6 +2,7 @@ + //{{{ Package, imports + package king; + import king.core.*; ++import king.core.Painter; + 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 +@@ -2,6 +2,7 @@ + //{{{ Package, imports + package king; + import king.core.*; ++import king.core.Painter; + + 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 +@@ -2,6 +2,7 @@ + //{{{ Package, imports + package king; + import king.core.*; ++import king.core.Painter; + 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 +@@ -3,6 +3,7 @@ + package king.tool.draw; + import king.*; + import king.core.*; ++import king.core.Painter; + import king.points.*; + + import java.awt.*; diff -Nru king-2.21.120420/debian/patches/series king-2.21.120420/debian/patches/series --- king-2.21.120420/debian/patches/series 2012-04-20 11:51:33.000000000 +0200 +++ king-2.21.120420/debian/patches/series 2012-06-23 15:51:20.000000000 +0200 @@ -1 +1,2 @@ use_debian_packaged_jars.patch +java7-compat.patch
