[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. debian/8.1.0+dfsg-2-7-ge403525

[Jakub Adam]

The following commit has been merged in the master branch:
commit 2c3b07796aac2746aa854e7ee806c877a8d89fff
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Dec 20 12:44:34 2012 +0100

    Removed d/patches/ebug-382496.patch (applied upstream)

diff --git a/debian/changelog b/debian/changelog
index bc460bb..7311857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eclipse-cdt (8.1.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * Rewritten obsolete d/fetch-cdt.sh.
   * Updated d/watch.
+  * Removed d/patches/ebug-382496.patch (applied upstream).
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 20 Dec 2012 12:29:49 +0100
 
diff --git a/debian/patches/ebug-382496.patch b/debian/patches/ebug-382496.patch
deleted file mode 100644
index b18ce5d..0000000
--- a/debian/patches/ebug-382496.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a2f501987dad996835b2245524ea02632698d597 Mon Sep 17 00:00:00 2001
-From: Mikhail Khodjaiants
-Date: Thu, 14 Jun 2012 11:14:28 -0400
-Subject: Bug 382496 - Eclipse hangs on 'Terminate and Remove' in the CDT debugger
-
----
-diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java
-index c65e8f9..1923234 100644
---- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java
-+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunch.java
-@@ -83,12 +83,7 @@ public class GdbLaunch extends DsfLaunch
- 
-         // Create the dispatch queue to be used by debugger control and services 
-         // that belong to this launch
--        final DefaultDsfExecutor dsfExecutor = new DefaultDsfExecutor(GdbLaunchDelegate.GDB_DEBUG_MODEL_ID);
--        // Bug 293109 comment 14
--        // We can use delayed task on the executor, but once it is shutdown, we don't want to execute them.
--        // For instance, in GDBBackend, we start a 30-second delayed task to check that GDB properly started.
--        dsfExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
--        
-+        final DefaultDsfExecutor dsfExecutor = new DefaultDsfExecutor(GdbLaunchDelegate.GDB_DEBUG_MODEL_ID);        
-         dsfExecutor.prestartCoreThread();
-         fExecutor = dsfExecutor;
-         fSession = DsfSession.startSession(fExecutor, GdbLaunchDelegate.GDB_DEBUG_MODEL_ID);
---
-cgit v0.8.3.4-115-g1759
diff --git a/debian/patches/series b/debian/patches/series
index b996045..4ec0812 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use-default-cppflags.patch
-ebug-382496.patch
 autotools-add-distro-version-to-list.patch

-- 
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.