This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository easymock.
commit 23cbc3954a08dc8eabce50c8b5755639b927e106 Author: Markus Koschany <a...@debian.org> Date: Thu Apr 12 20:11:31 2018 +0200 Revert "Refresh patches" This reverts commit 93766155d38e6a1f86d15c1701f91220bb3b8614. --- core/src/main/java/org/easymock/internal/MocksControl.java | 3 +++ debian/changelog | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/easymock/internal/MocksControl.java b/core/src/main/java/org/easymock/internal/MocksControl.java index a096fdf..c328735 100644 --- a/core/src/main/java/org/easymock/internal/MocksControl.java +++ b/core/src/main/java/org/easymock/internal/MocksControl.java @@ -155,6 +155,9 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>, } // ///CLOVER:OFF + if (AndroidSupport.isAndroid()) { + return classProxyFactory = new AndroidClassProxyFactory(); + } // ///CLOVER:ON return classProxyFactory = new ClassProxyFactory(); diff --git a/debian/changelog b/debian/changelog index c2b78a1..424bc20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,6 @@ easymock (3.6-1) unstable; urgency=medium * Update copyright years. * Declare compliance with Debian Policy 4.1.4. * Use compat level 11. - * Refresh the patches. * Build-depend on libmaven-enforcer-plugin-java and libanimal-sniffer-java. -- Markus Koschany <a...@debian.org> Thu, 12 Apr 2018 19:58:32 +0200 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits