[easymock] 12/37: Drop no-android.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository easymock.

commit 029fa4529fbdf9478321d094b9fc0c75783009d8
Author: Markus Koschany <apo at debian.org>
Date:   Fri Oct 7 12:37:51 2016 +0200

    Drop no-android.patch
---
 debian/patches/no-android.patch | 25 -------------------------
 debian/patches/series           |  1 -
 2 files changed, 26 deletions(-)

diff --git a/debian/patches/no-android.patch b/debian/patches/no-android.patch
deleted file mode 100644
index 2a4f1f9..0000000
--- a/debian/patches/no-android.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Wed, 13 Nov 2013 17:39:25 +0100
-Subject: no android
-
----
- src/org/easymock/internal/MocksControl.java | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/org/easymock/internal/MocksControl.java b/src/org/easymock/internal/MocksControl.java
-index e709dc4..579a570 100644
---- a/src/org/easymock/internal/MocksControl.java
-+++ b/src/org/easymock/internal/MocksControl.java
-@@ -138,9 +138,9 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
-         }
- 
-         // ///CLOVER:OFF
--        if (AndroidSupport.isAndroid()) {
--            return classProxyFactory = new AndroidClassProxyFactory();
--        }
-+        // if (AndroidSupport.isAndroid()) {
-+        //     return classProxyFactory = new AndroidClassProxyFactory();
-+        // }
-         // ///CLOVER:ON
- 
-         try {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d1d13c1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-no-android.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git