The following commit has been merged in the master branch:
commit 1c01d2bbc53edf67cd690e0ec6de70b530853a94
Author: Jakub Adam <jakub.a...@ktknet.cz>
Date:   Sun Apr 1 21:37:11 2012 +0200

    Fix test execution failure leading to FTBFS.
    
    Apache Ant 1.8.2 will not automatically initialize a new Project.
    This fixes #666612.

diff --git a/debian/changelog b/debian/changelog
index 4fe978f..d5d880c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jgit (1.3.0-2) UNRELEASED; urgency=low
+
+  * Fix test execution failure leading to FTBFS (Closes: #666612).
+
+ -- Jakub Adam <jakub.a...@ktknet.cz>  Sun, 01 Apr 2012 21:39:33 +0200
+
 jgit (1.3.0-1) unstable; urgency=low
 
   * New Upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index 75adbd7..509393a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian-custom-build.patch
+tests-init-ant-project.patch
diff --git a/debian/patches/tests-init-ant-project.patch 
b/debian/patches/tests-init-ant-project.patch
new file mode 100644
index 0000000..56f12d7
--- /dev/null
+++ b/debian/patches/tests-init-ant-project.patch
@@ -0,0 +1,22 @@
+From: Jakub Adam <jakub.a...@ktknet.cz>
+Date: Sun, 1 Apr 2012 21:33:35 +0200
+Subject: tests-init-ant-project
+
+Apache Ant 1.8.2 will not automatically initialize a new Project.
+This fixes FTBFS #666612.
+---
+ .../eclipse/jgit/ant/tasks/GitCloneTaskTest.java   |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git 
a/org.eclipse.jgit.ant.test/src/org/eclipse/jgit/ant/tasks/GitCloneTaskTest.java
 
b/org.eclipse.jgit.ant.test/src/org/eclipse/jgit/ant/tasks/GitCloneTaskTest.java
+index c7b949c..2da9d2a 100644
+--- 
a/org.eclipse.jgit.ant.test/src/org/eclipse/jgit/ant/tasks/GitCloneTaskTest.java
++++ 
b/org.eclipse.jgit.ant.test/src/org/eclipse/jgit/ant/tasks/GitCloneTaskTest.java
+@@ -64,6 +64,7 @@
+       @Before
+       public void before() {
+               project = new Project();
++              project.init();
+               enableLogging();
+               project.addTaskDefinition("git-clone", GitCloneTask.class);
+               task = (GitCloneTask) project.createTask("git-clone");

-- 
UNNAMED PROJECT

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to