The following commit has been merged in the master branch:
commit c12c2b1561f6f14088fc845da472fa5f36b25814
Author: Jakub Adam <[email protected]>
Date: Sat Jun 23 16:18:42 2012 +0200
Drop d/patches/tests-init-ant-project.patch. Applied upstream
diff --git a/debian/changelog b/debian/changelog
index 604c644..651a8c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jgit (2.0.0-1) UNRELEASED; urgency=low
* New Upstream release.
* Refreshed d/patches/debian-custom-build.patch.
+ * Drop d/patches/tests-init-ant-project.patch. Applied upstream.
-- Jakub Adam <[email protected]> Sat, 23 Jun 2012 16:15:32 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 509393a..75adbd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
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
deleted file mode 100644
index 56f12d7..0000000
--- a/debian/patches/tests-init-ant-project.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Jakub Adam <[email protected]>
-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
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
