The following commit has been merged in the master branch:
commit ee0825d8ebc6f02115ead1c302556fea5d4f5d08
Author: Jakub Adam <[email protected]>
Date: Mon Jun 25 16:55:17 2012 +0200
Fix FTBFS with Eclipse 3.8 (Closes: #678768)
Bump (Build-)Depends on eclipse to 3.8.
diff --git a/debian/changelog b/debian/changelog
index d763b3b..ea19321 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+eclipse-mercurialeclipse (1.9.4-2) UNRELEASED; urgency=low
+
+ * Fix FTBFS with Eclipse 3.8 (Closes: #678768).
+ * Bump (Build-)Depends on eclipse to 3.8.
+
+ -- Jakub Adam <[email protected]> Mon, 25 Jun 2012 16:51:21 +0200
+
eclipse-mercurialeclipse (1.9.4-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 87ebb27..823d4fd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers
<[email protected]
Uploaders: Jakub Adam <[email protected]>
Build-Depends: debhelper (>= 8~),
default-jdk,
- eclipse-pde (>= 3.7~exp),
+ eclipse-pde (>= 3.8~),
eclipse-mylyn,
javahelper (>= 0.32~),
unzip,
@@ -17,7 +17,7 @@ Homepage: http://www.javaforge.com/project/HGE
Package: eclipse-mercurialeclipse
Architecture: all
-Depends: eclipse-platform (>= 3.7~exp),
+Depends: eclipse-platform (>= 3.8~),
eclipse-mylyn,
mercurial,
${orbit:Depends},
diff --git a/debian/patches/eclipse-3.8-compat.patch
b/debian/patches/eclipse-3.8-compat.patch
new file mode 100644
index 0000000..61a0f83
--- /dev/null
+++ b/debian/patches/eclipse-3.8-compat.patch
@@ -0,0 +1,45 @@
+From: Jakub Adam <[email protected]>
+Date: Mon, 25 Jun 2012 16:48:55 +0200
+Subject: eclipse-3.8-compat
+
+---
+ .../MercurialEclipse/model/resources/HgContainerAdapter.java | 10 ++++++++++
+ .../MercurialEclipse/model/resources/HgFileAdapter.java | 4 ++++
+ 2 files changed, 14 insertions(+)
+
+diff --git
a/plugin/src/com/vectrace/MercurialEclipse/model/resources/HgContainerAdapter.java
b/plugin/src/com/vectrace/MercurialEclipse/model/resources/HgContainerAdapter.java
+index 2d48e03..004eaa7 100644
+---
a/plugin/src/com/vectrace/MercurialEclipse/model/resources/HgContainerAdapter.java
++++
b/plugin/src/com/vectrace/MercurialEclipse/model/resources/HgContainerAdapter.java
+@@ -54,6 +54,16 @@ public abstract class HgContainerAdapter extends
HgResourceAdapter implements IC
+ }
+ }
+
++ public void accept(IResourceProxyVisitor visitor, int depth, int
memberFlags) throws CoreException {
++ boolean ok = visitor.visit(createProxy());
++ if(ok) {
++ IResource[] members = members();
++ for (IResource resource : members) {
++ resource.accept(visitor, depth, memberFlags);
++ }
++ }
++ }
++
+ public void accept(IResourceVisitor visitor, int depth, int
memberFlags) throws CoreException {
+ boolean ok = visitor.visit(this);
+ if(ok) {
+diff --git
a/plugin/src/com/vectrace/MercurialEclipse/model/resources/HgFileAdapter.java
b/plugin/src/com/vectrace/MercurialEclipse/model/resources/HgFileAdapter.java
+index c441f6b..83ddbb2 100644
+---
a/plugin/src/com/vectrace/MercurialEclipse/model/resources/HgFileAdapter.java
++++
b/plugin/src/com/vectrace/MercurialEclipse/model/resources/HgFileAdapter.java
+@@ -199,6 +199,10 @@ public class HgFileAdapter extends HgResourceAdapter
implements IFile {
+ visitor.visit(createProxy());
+ }
+
++ public void accept(IResourceProxyVisitor visitor, int depth, int
memberFlags) throws CoreException {
++ accept(visitor, memberFlags);
++ }
++
+ public void accept(IResourceVisitor visitor, int depth, int
memberFlags) throws CoreException {
+ visitor.visit(this);
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e2066e7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+eclipse-3.8-compat.patch
--
eclipse-mercurialeclipse packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
