[lucene4.10] 09/11: Added an explicit dependency on hamcrest to avoid a build failure in test-framework (Closes: #822843)

[Emmanuel Bourg]

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

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

commit 062ecbf5d67ee887c731b4fd9fa938656030ecfb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 3 16:59:31 2016 +0200

    Added an explicit dependency on hamcrest to avoid a build failure in test-framework (Closes: #822843)
---
 debian/changelog                                      |  2 ++
 debian/patches/0007-missing-hamcrest-dependency.patch | 14 ++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c03f155..7a75a9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 lucene4.10 (4.10.4+dfsg-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Added an explicit dependency on hamcrest to avoid a build failure
+    in test-framework (Closes: #822843)
   * Build with ivy-debian-helper
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Fixed a build failure caused by the removal of libservlet2.5-java
diff --git a/debian/patches/0007-missing-hamcrest-dependency.patch b/debian/patches/0007-missing-hamcrest-dependency.patch
new file mode 100644
index 0000000..0638f7c
--- /dev/null
+++ b/debian/patches/0007-missing-hamcrest-dependency.patch
@@ -0,0 +1,14 @@
+Description: Add an explicit dependency on hamcrest to avoid a build failure in test-framework (why?)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/822843
+--- a/test-framework/ivy.xml
++++ b/test-framework/ivy.xml
+@@ -32,6 +32,7 @@
+     <dependency org="org.apache.ant" name="ant" rev="${/org.apache.ant/ant}" conf="compile"/>
+ 
+     <dependency org="junit" name="junit" rev="${/junit/junit}" conf="compile,junit4-stdalone"/>
++    <dependency org="org.hamcrest" name="hamcrest-core" rev="debian" conf="compile,junit4-stdalone"/>
+     <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="${/com.carrotsearch.randomizedtesting/junit4-ant}" conf="compile,junit4-stdalone"/>
+     <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" conf="compile,junit4-stdalone"/>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e98063a..06d0853 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0005-Revert-upstream-removal-of-deprecated-QueryParser-co.patch
 0006-use-local-artifacts.patch
+0007-missing-hamcrest-dependency.patch

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