This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository easymock.
commit 74ccb0ae93a51bb85c0a25c22fd81cad3abfea09 Author: Niels Thykier <[email protected]> Date: Tue Jun 19 22:17:51 2012 +0000 Apply patch from James Page to FTBFS with Java7 --- debian/changelog | 8 ++++ debian/patches/java7-compat.patch | 98 +++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 107 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7ac745e..8dd34e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +easymock (2.4+ds1-7) UNRELEASED; urgency=low + + * Team upload. + * Apply patch from James Page to fix FTBFS with OpenJDK-7 + as default-java. (Closes: #678170, LP: #888122) + + -- Niels Thykier <[email protected]> Wed, 20 Jun 2012 00:05:34 +0200 + easymock (2.4+ds1-6) unstable; urgency=low * Team upload. diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch new file mode 100644 index 0000000..cf69583 --- /dev/null +++ b/debian/patches/java7-compat.patch @@ -0,0 +1,98 @@ +Description: This patch works around tighter closure handling in + Java 7 and aligns to changes in easymock 3.1 upstream. + . + This patch should be dropped when the new version of easymock + is uploaded. +Author: James Page <[email protected]> +Forwarded: not-needed + +Index: easymock/src/org/easymock/EasyMock.java +=================================================================== +--- easymock.orig/src/org/easymock/EasyMock.java 2012-05-21 11:56:31.111766000 +0100 ++++ easymock/src/org/easymock/EasyMock.java 2012-05-21 12:01:38.793400467 +0100 +@@ -1430,7 +1430,7 @@ + * @param captured Where the parameter is captured + * @return <code>0</code> + */ +- public static int capture(Capture<Integer> captured) { ++ public static int captureInt(Capture<Integer> captured) { + reportMatcher(new Captures<Integer>(captured)); + return 0; + } +@@ -1441,7 +1441,7 @@ + * @param captured Where the parameter is captured + * @return <code>0</code> + */ +- public static long capture(Capture<Long> captured) { ++ public static long captureLong(Capture<Long> captured) { + reportMatcher(new Captures<Long>(captured)); + return 0; + } +@@ -1452,7 +1452,7 @@ + * @param captured Where the parameter is captured + * @return <code>0</code> + */ +- public static float capture(Capture<Float> captured) { ++ public static float captureFloat(Capture<Float> captured) { + reportMatcher(new Captures<Float>(captured)); + return 0; + } +@@ -1463,7 +1463,7 @@ + * @param captured Where the parameter is captured + * @return <code>0</code> + */ +- public static double capture(Capture<Double> captured) { ++ public static double captureDouble(Capture<Double> captured) { + reportMatcher(new Captures<Double>(captured)); + return 0; + } +@@ -1474,7 +1474,7 @@ + * @param captured Where the parameter is captured + * @return <code>0</code> + */ +- public static byte capture(Capture<Byte> captured) { ++ public static byte captureByte(Capture<Byte> captured) { + reportMatcher(new Captures<Byte>(captured)); + return 0; + } +@@ -1485,7 +1485,7 @@ + * @param captured Where the parameter is captured + * @return <code>0</code> + */ +- public static char capture(Capture<Character> captured) { ++ public static char captureChar(Capture<Character> captured) { + reportMatcher(new Captures<Character>(captured)); + return 0; + } +Index: easymock/tests/org/easymock/tests2/CaptureTest.java +=================================================================== +--- easymock.orig/tests/org/easymock/tests2/CaptureTest.java 2012-05-21 11:56:31.111766000 +0100 ++++ easymock/tests/org/easymock/tests2/CaptureTest.java 2012-05-21 12:08:58.146906680 +0100 +@@ -57,7 +57,7 @@ + Capture<Integer> capture = new Capture<Integer>(); + IMethods mock = createMock(IMethods.class); + +- expect(mock.oneArg(capture(capture))).andReturn("answer"); ++ expect(mock.oneArg(captureInt(capture))).andReturn("answer"); + expect(mock.oneArg((Integer) capture(capture))).andReturn("answer"); + + replay(mock); +@@ -98,12 +98,12 @@ + + IMethods mock = createMock(IMethods.class); + +- expect(mock.oneArg(capture(captureI))).andReturn("answerI"); +- expect(mock.oneArg(capture(captureL))).andReturn("answerL"); +- expect(mock.oneArg(capture(captureF))).andReturn("answerF"); +- expect(mock.oneArg(capture(captureD))).andReturn("answerD"); +- expect(mock.oneArg(capture(captureB))).andReturn("answerB"); +- expect(mock.oneArg(capture(captureC))).andReturn("answerC"); ++ expect(mock.oneArg(captureInt(captureI))).andReturn("answerI"); ++ expect(mock.oneArg(captureLong(captureL))).andReturn("answerL"); ++ expect(mock.oneArg(captureFloat(captureF))).andReturn("answerF"); ++ expect(mock.oneArg(captureDouble(captureD))).andReturn("answerD"); ++ expect(mock.oneArg(captureByte(captureB))).andReturn("answerB"); ++ expect(mock.oneArg(captureChar(captureC))).andReturn("answerC"); + + replay(mock); + diff --git a/debian/patches/series b/debian/patches/series index b5a71cc..0d34367 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 10_create_link_to_samples_and_javadocs_in_Documentation.dpatch +java7-compat.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
