[SCM] mockito packaging branch, master, updated. debian/1.9.5+ds-1-5-g5ec233d
Markus Koschany
apo at gambaru.de
Tue Jun 18 23:08:23 UTC 2013
The following commit has been merged in the master branch:
commit 5ec233d7d1a808d59016143b437465b7f024851d
Author: Markus Koschany <apo at gambaru.de>
Date: Wed Jun 19 01:08:23 2013 +0200
Add Forwarded: not-needed to patches.
diff --git a/debian/patches/00-use_system_libraries.patch b/debian/patches/00-use_system_libraries.patch
index 8854717..94327f8 100644
--- a/debian/patches/00-use_system_libraries.patch
+++ b/debian/patches/00-use_system_libraries.patch
@@ -4,6 +4,8 @@ Subject: 00 use_system_libraries
Use Debian's libraries instead of the embedded libraries that are shipped with
mockito.
+
+Forwarded: not-needed
---
org/mockito/internal/creation/CglibMockMaker.java | 4 ++--
.../internal/creation/DelegatingMockitoMethodProxy.java | 4 ++--
diff --git a/debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch b/debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch
index 3a80454..3c95b89 100644
--- a/debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch
+++ b/debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch
@@ -6,7 +6,7 @@ Mockito fails to build from source with Debian's version of libhamcrest. This
patch implements the missing interface.
Bug: http://bugs.debian.org/661877
-
+Forwarded: not-needed
---
org/mockito/internal/matchers/LocalizedMatcher.java | 4 ++++
1 file changed, 4 insertions(+)
--
mockito packaging
More information about the pkg-java-commits
mailing list