[eclipse-jgit] 03/03: Fix test failure in org.eclipse.jgit.pgm.ArchiveTest

[Jakub Adam]

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

xhaakon-guest pushed a commit to branch master
in repository eclipse-jgit.

commit e415a5c15c92155976a2672239179f2ea8770e91
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Mar 26 19:44:49 2014 +0100

    Fix test failure in org.eclipse.jgit.pgm.ArchiveTest
    
    Added libxz-java into Build-Depends and into org.eclipse.jgit.pgm.test/pom.xml
    since the dependency has been made optional in libcommons-compress-java.
---
 debian/changelog                                   |  3 +++
 debian/control                                     |  1 +
 .../patches/fix-jgit-pgm-test-dependencies.patch   | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f9b7062..f016625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 jgit (3.3.1-1) UNRELEASED; urgency=medium
 
   * New Upstream release.
+  * Fix test failure in org.eclipse.jgit.pgm.ArchiveTest. Added libxz-java
+    into Build-Depends and into org.eclipse.jgit.pgm.test/pom.xml since
+    the dependency has been made optional in libcommons-compress-java.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 26 Mar 2014 19:11:23 +0100
 
diff --git a/debian/control b/debian/control
index 8326c3e..53497f2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 9~),
                libmaven-antrun-plugin-java,
                libmaven-javadoc-plugin-java,
                libclirr-maven-plugin-java,
+               libxz-java,
                maven-debian-helper,
                maven-repo-helper
 Standards-Version: 3.9.5
diff --git a/debian/patches/fix-jgit-pgm-test-dependencies.patch b/debian/patches/fix-jgit-pgm-test-dependencies.patch
new file mode 100644
index 0000000..06b4b7f
--- /dev/null
+++ b/debian/patches/fix-jgit-pgm-test-dependencies.patch
@@ -0,0 +1,25 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Wed, 26 Mar 2014 20:03:03 +0100
+Subject: fix-jgit-pgm-test-dependencies
+
+---
+ org.eclipse.jgit.pgm.test/pom.xml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml
+index a0490e8..a24ed56 100644
+--- a/org.eclipse.jgit.pgm.test/pom.xml
++++ b/org.eclipse.jgit.pgm.test/pom.xml
+@@ -101,6 +101,12 @@
+       <version>${project.version}</version>
+     </dependency>
+ 
++    <dependency>
++      <groupId>org.tukaani</groupId>
++      <artifactId>xz</artifactId>
++      <version>debian</version>
++    </dependency>
++
+   </dependencies>
+ 
+   <build>
diff --git a/debian/patches/series b/debian/patches/series
index 9768eaa..5beecbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 debian-custom-build.patch
 ftbfs-args4j-2.0.25-fix.patch
 unversioned-orbit-dependencies.patch
+fix-jgit-pgm-test-dependencies.patch

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