Author: tille Date: 2012-06-25 07:51:13 +0000 (Mon, 25 Jun 2012) New Revision: 11453
Added: trunk/packages/king/trunk/debian/patches/java7-compat.patch Modified: trunk/packages/king/trunk/debian/changelog trunk/packages/king/trunk/debian/patches/series Log: Patch to build using Java 7 thanks to Niels Thykier. Modified: trunk/packages/king/trunk/debian/changelog =================================================================== --- trunk/packages/king/trunk/debian/changelog 2012-06-24 16:11:03 UTC (rev 11452) +++ trunk/packages/king/trunk/debian/changelog 2012-06-25 07:51:13 UTC (rev 11453) @@ -1,3 +1,11 @@ +king (2.21.120420-2) unstable; urgency=low + + [ Niels Thykier ] + * Fix FTBFS with Java7 + Closes: #678654 + + -- Andreas Tille <[email protected]> Mon, 25 Jun 2012 09:40:44 +0200 + king (2.21.120420-1) unstable; urgency=low * New upstream version Added: trunk/packages/king/trunk/debian/patches/java7-compat.patch =================================================================== --- trunk/packages/king/trunk/debian/patches/java7-compat.patch (rev 0) +++ trunk/packages/king/trunk/debian/patches/java7-compat.patch 2012-06-25 07:51:13 UTC (rev 11453) @@ -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.*; Modified: trunk/packages/king/trunk/debian/patches/series =================================================================== --- trunk/packages/king/trunk/debian/patches/series 2012-06-24 16:11:03 UTC (rev 11452) +++ trunk/packages/king/trunk/debian/patches/series 2012-06-25 07:51:13 UTC (rev 11453) @@ -1 +1,2 @@ use_debian_packaged_jars.patch +java7-compat.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
