Package: easymock
Version: 2.4+ds1-6
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS ith openjdk-7 (LP: #888122):
- d/patches/java7-compat.patch: Adapted patch from upstream trunk
to support compilation under Java 7 which has tighter checks on
conflicting erasures for methods.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Kernel: Linux 3.4.0-5-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJP4L6nAAoJEL/srsug59jDX2sP/0gHcIKCS1S+ewm4De2Rtqb6
nz699RAcEL1jTOeHC4KOsm+hg1XGYFylYire8WVFCLxDYhF8OS12ScFyemacOWZN
NLdqf1NFDScFG1TRO26eUZoiOQMdSMp3zzER3yJUq7iq8MSj4AwZteL6z7C08OV8
DNyx+lzjyQUzKf1d/AlxxQcOyFTrFxgNcJ6DnIIbUg4A9l/56+sYL0YuBL1rMf3Z
ENb1JWN0MAem66/swAeHSX6HSlxnSmGqJ7tHyJWrZwm6vmQnNJHZ5TJk5mdlEHDA
0bIBiE2CeyjfjxbqKY0L+dvWv4OlUcv+UA3vUkFFdoeLbTrO6XsoIqutJhkhsG+f
Az74FmVKZIdsVS+LKZCS0eb0UEUYF/JQbRNxugft8c/2FZAWFmg1H6URud+4a0id
Ye8Sq9tnGlQwBYX4BclWGybr92WLPEE8/1E74lGA9wElq9aTmF8tmhELivpfw6Iq
6OT47CqRYEbdEJZcCOujkUA6W1tTmlr8xijI7rVnv7hTuYGk120BAyDteoDyvXnA
Sl37R0cGpuq4BkZimdEzgdaSv18ROACUKWIZW1vlOcFgd3sXIwAg2t7xBvjMU4LA
uS5L/JD9e8U4Ze1kjNGiBHdla78ZrcNwIRNvi3vK6bWZa98Jrh/xvXZChtFnwFGG
t1x18jcp/BZ7QGTlH7Oi
=Ktzs
-----END PGP SIGNATURE-----
=== added file 'debian/patches/java7-compat.patch'
--- debian/patches/java7-compat.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/java7-compat.patch 2012-06-19 17:57:59 +0000
@@ -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);
+
=== modified file 'debian/patches/series'
--- debian/patches/series 2010-05-03 20:12:00 +0000
+++ debian/patches/series 2012-06-19 17:57:59 +0000
@@ -1 +1,2 @@
10_create_link_to_samples_and_javadocs_in_Documentation.dpatch
+java7-compat.patch
