[SCM] mockito packaging branch, master, updated. debian/1.9.5+ds-1-4-g6dfb56a

Markus Koschany apo at gambaru.de
Tue Jun 18 23:06:31 UTC 2013


The following commit has been merged in the master branch:
commit 309531442a431db64dd0965074322478435a35e3
Author: Markus Koschany <apo at gambaru.de>
Date:   Wed Jun 19 00:17:57 2013 +0200

    Update patch DEP-3 headers.

diff --git a/debian/patches/00-use_system_libraries.patch b/debian/patches/00-use_system_libraries.patch
index 571fea9..8854717 100644
--- a/debian/patches/00-use_system_libraries.patch
+++ b/debian/patches/00-use_system_libraries.patch
@@ -2,6 +2,8 @@ From: Markus Koschany <apo at gambaru.de>
 Date: Sat, 15 Jun 2013 12:24:11 +0200
 Subject: 00 use_system_libraries
 
+Use Debian's libraries instead of the embedded libraries that are shipped with
+mockito.
 ---
  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 c760143..3a80454 100644
--- a/debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch
+++ b/debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch
@@ -2,6 +2,11 @@ From: David Paleino <dapal at debian.org>
 Date: Sat, 15 Jun 2013 12:12:42 +0200
 Subject: 01 fix_FTBFS_with_hamcrest_interfaces
 
+Mockito fails to build from source with Debian's version of libhamcrest. This
+patch implements the missing interface.
+
+Bug: http://bugs.debian.org/661877
+
 ---
  org/mockito/internal/matchers/LocalizedMatcher.java | 4 ++++
  1 file changed, 4 insertions(+)

-- 
mockito packaging



More information about the pkg-java-commits mailing list