[eclipse-mylyn-tasks-github] 05/06: Fixed the build failure caused by eclipse-egit 3.7 (Closes: #789988)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository eclipse-mylyn-tasks-github.

commit b12c42191a5e6d2908ff1df38625a25abf9f10e1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 20 01:12:20 2016 +0200

    Fixed the build failure caused by eclipse-egit 3.7 (Closes: #789988)
---
 debian/changelog                                |  1 +
 debian/control                                  |  2 +-
 debian/patches/eclipse-egit-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                           |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8c9edae..c22bb53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eclipse-mylyn-tasks-github (3.3.0-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure caused by eclipse-egit 3.7 (Closes: #789988)
   * Compile with javac instead of the Eclipse compiler
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index d770756..aa57c38 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 9),
                default-jdk,
                eclipse-pde,
-               eclipse-egit,
+               eclipse-egit (>= 3.7),
                eclipse-mylyn,
                javahelper (>= 0.32~),
                libgoogle-gson-java,
diff --git a/debian/patches/eclipse-egit-compatibility.patch b/debian/patches/eclipse-egit-compatibility.patch
new file mode 100644
index 0000000..1388126
--- /dev/null
+++ b/debian/patches/eclipse-egit-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the latest version of eclipse-egit
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositorySelectionWizardPage.java
++++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositorySelectionWizardPage.java
+@@ -24,7 +24,7 @@
+ import org.eclipse.egit.github.core.client.GitHubClient;
+ import org.eclipse.egit.github.core.service.OrganizationService;
+ import org.eclipse.egit.github.core.service.RepositoryService;
+-import org.eclipse.egit.ui.internal.FilteredCheckboxTree;
++import org.eclipse.egit.ui.internal.components.FilteredCheckboxTree;
+ import org.eclipse.jface.layout.GridDataFactory;
+ import org.eclipse.jface.layout.GridLayoutFactory;
+ import org.eclipse.jface.operation.IRunnableWithProgress;
diff --git a/debian/patches/series b/debian/patches/series
index 4a872b5..657ac2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 unversioned-orbitdeps.patch
+eclipse-egit-compatibility.patch

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