[powermock] 03/05: Refreshed the patch

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository powermock.

commit eabf7f14a438e0180b2e8c804be32bc36fab7e32
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 11 22:42:56 2016 +0100

    Refreshed the patch
---
 debian/changelog                              |  4 +++-
 debian/patches/01-mockito-compatibility.patch | 15 +--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c211f12..0082d0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-powermock (1.6.5-2) UNRELEASED; urgency=medium
+powermock (1.6.6-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Refreshed the patch
   * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 11 Nov 2016 22:28:11 +0100
diff --git a/debian/patches/01-mockito-compatibility.patch b/debian/patches/01-mockito-compatibility.patch
index f8d10bc..9735c37 100644
--- a/debian/patches/01-mockito-compatibility.patch
+++ b/debian/patches/01-mockito-compatibility.patch
@@ -66,21 +66,8 @@ Forwarded: not-needed
 -import org.mockito.cglib.proxy.MethodProxy;
 +import net.sf.cglib.proxy.MethodProxy;
  
- import java.io.Serializable;
  import java.lang.reflect.Field;
---- a/api/mockito/src/main/java/org/powermock/api/extension/proxyframework/ProxyFrameworkImpl.java
-+++ b/api/mockito/src/main/java/org/powermock/api/extension/proxyframework/ProxyFrameworkImpl.java
-@@ -15,8 +15,8 @@
-  */
- package org.powermock.api.extension.proxyframework;
- 
--import org.mockito.cglib.proxy.Enhancer;
--import org.mockito.cglib.proxy.Factory;
-+import net.sf.cglib.proxy.Enhancer;
-+import net.sf.cglib.proxy.Factory;
- import org.powermock.reflect.spi.ProxyFramework;
- 
- /**
+ 
 --- a/api/mockito/src/main/java/org/powermock/api/mockito/repackaged/MockitoNamingPolicy.java
 +++ b/api/mockito/src/main/java/org/powermock/api/mockito/repackaged/MockitoNamingPolicy.java
 @@ -4,7 +4,7 @@

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