[eclipse-ptp] 04/05: Removed d/patches/fix-build-with-cdt-8.2.1.patch

[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-ptp.

commit bd4d70ca57f245469bb3fd214b167d702f66f9fd
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Jun 2 22:19:35 2014 +0200

    Removed d/patches/fix-build-with-cdt-8.2.1.patch
---
 debian/changelog                              |  2 ++
 debian/patches/fix-build-with-cdt-8.2.1.patch | 42 ---------------------------
 debian/patches/series                         |  1 -
 3 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7b20c9..fcf36a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 eclipse-ptp (7.0.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Removed d/patches/fix-build-with-cdt-8.2.1.patch
+    - fixed upstream.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 02 Jun 2014 22:16:11 +0200
 
diff --git a/debian/patches/fix-build-with-cdt-8.2.1.patch b/debian/patches/fix-build-with-cdt-8.2.1.patch
deleted file mode 100644
index 80e91d0..0000000
--- a/debian/patches/fix-build-with-cdt-8.2.1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Greg Watson <g.watson at computer.org>
-Date: Wed, 21 Aug 2013 13:38:04 -0400
-Subject: fix-build-with-cdt-8.2.1
-
----
- .../eclipse/ptp/internal/rdt/ui/actions/GenerateActionGroup.java  | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/GenerateActionGroup.java b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/GenerateActionGroup.java
-index 4be3a3d..42c3cd6 100755
---- a/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/GenerateActionGroup.java
-+++ b/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/actions/GenerateActionGroup.java
-@@ -25,7 +25,7 @@ import java.util.List;
- import org.eclipse.cdt.internal.ui.IContextMenuConstants;
- import org.eclipse.cdt.internal.ui.actions.ActionMessages;
- import org.eclipse.cdt.internal.ui.actions.CDTQuickMenuCreator;
--import org.eclipse.cdt.internal.ui.editor.AddIncludeOnSelectionAction;
-+import org.eclipse.cdt.internal.ui.editor.AddIncludeAction;
- import org.eclipse.cdt.internal.ui.editor.CEditor;
- import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds;
- import org.eclipse.cdt.internal.ui.editor.SortLinesAction;
-@@ -116,7 +116,7 @@ public class GenerateActionGroup extends ActionGroup implements ISelectionChange
- 	private List<ISelectionChangedListener> fRegisteredSelectionListeners;
- //	private List<RefactoringAction> fRefactorActions= new ArrayList<RefactoringAction>();
- 	
--	private AddIncludeOnSelectionAction fAddInclude;
-+	private AddIncludeAction fAddInclude;
- //	private OverrideMethodsAction fOverrideMethods;
- //	private GenerateHashCodeEqualsAction fHashCodeEquals;
- //	private AddGetterSetterAction fAddGetterSetter;
-@@ -152,9 +152,9 @@ public class GenerateActionGroup extends ActionGroup implements ISelectionChange
- 		fEditor= editor;
- 		fGroupName= groupName;
- 				
--		fAddInclude= new AddIncludeOnSelectionAction(editor);
-+		fAddInclude= new AddIncludeAction(editor);
- 		fAddInclude.setActionDefinitionId(ICEditorActionDefinitionIds.ADD_INCLUDE);
--		editor.setAction("AddIncludeOnSelection", fAddInclude); //$NON-NLS-1$
-+		editor.setAction("AddInclude", fAddInclude); //$NON-NLS-1$
- 		
- //		fOrganizeIncludes= new OrganizeIncludesAction(editor);
- //		fOrganizeIncludes.setActionDefinitionId(ICEditorActionDefinitionIds.ORGANIZE_INCLUDES);
diff --git a/debian/patches/series b/debian/patches/series
index 8826e4e..57c7ffb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ remove-cdt-xlc-dependency.patch
 disable-rdt-ui.patch
 remove-cdt-upc-dependency.patch
 disable-unneeded-core-bundles.patch
-fix-build-with-cdt-8.2.1.patch

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