[eclipse-linuxtools] 04/14: Refreshed d/patches

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

commit 15f4c605745d2c61d531d96ff465b75edbca1f15
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jul 4 10:40:18 2013 +0200

    Refreshed d/patches
---
 debian/changelog                                   |  1 +
 debian/patches/fix-bundle-build-order.patch        | 15 +++--------
 .../remote-profiling-disable-rdt-proxy.patch       | 10 +++----
 debian/patches/series                              |  1 -
 ...algrind-remote-unversioned-rse-dependency.patch | 31 ----------------------
 5 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad7f6c5..51de6c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eclipse-linuxtools (2.0.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refreshed d/patches.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 04 Jul 2013 10:25:36 +0200
 
diff --git a/debian/patches/fix-bundle-build-order.patch b/debian/patches/fix-bundle-build-order.patch
index 29f375f..a46dc03 100644
--- a/debian/patches/fix-bundle-build-order.patch
+++ b/debian/patches/fix-bundle-build-order.patch
@@ -3,24 +3,17 @@ Date: Thu, 26 Jul 2012 18:23:17 +0200
 Subject: fix-bundle-build-order
 
 ---
- .../feature.xml                                          |   14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ .../org.eclipse.linuxtools.tools.launch-feature/feature.xml     |    7 +++++++
+ 1 file changed, 7 insertions(+)
 
 diff --git a/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml b/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml
-index 9535ba5..03ffaad 100644
+index 9535ba5..1b84088 100644
 --- a/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml
 +++ b/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml
-@@ -30,6 +30,20 @@
+@@ -30,6 +30,13 @@
     </requires>
  
     <plugin
-+         id="org.eclipse.linuxtools.profiling.launch.ui"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
 +         id="org.eclipse.linuxtools.profiling.launch"
 +         download-size="0"
 +         install-size="0"
diff --git a/debian/patches/remote-profiling-disable-rdt-proxy.patch b/debian/patches/remote-profiling-disable-rdt-proxy.patch
index bee1e36..b85f8df 100644
--- a/debian/patches/remote-profiling-disable-rdt-proxy.patch
+++ b/debian/patches/remote-profiling-disable-rdt-proxy.patch
@@ -7,12 +7,12 @@ Subject: remote-profiling-disable-rdt-proxy
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml b/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
-index 77e4fd9..978539c 100644
+index b7afc35..353ae26 100644
 --- a/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
 +++ b/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
-@@ -40,12 +40,12 @@
-          version="0.0.0"
-          unpack="false"/>
+@@ -33,12 +33,12 @@
+       <import feature="org.eclipse.linuxtools.profiling" version="0.8.0" match="greaterOrEqual"/>
+    </requires>
  
 -   <plugin
 +   <!--plugin
@@ -25,7 +25,7 @@ index 77e4fd9..978539c 100644
  
     <plugin
           id="org.eclipse.linuxtools.ssh.proxy"
-@@ -54,11 +54,11 @@
+@@ -47,11 +47,11 @@
           version="0.0.0"
           unpack="false"/>
  
diff --git a/debian/patches/series b/debian/patches/series
index 225c6fb..e60f964 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 valgrind-add-swtchart.patch
-valgrind-remote-unversioned-rse-dependency.patch
 remote-profiling-disable-rdt-proxy.patch
 libhover-fix-automake-texinfo-parser.patch
 fix-bundle-build-order.patch
diff --git a/debian/patches/valgrind-remote-unversioned-rse-dependency.patch b/debian/patches/valgrind-remote-unversioned-rse-dependency.patch
deleted file mode 100644
index 3962f45..0000000
--- a/debian/patches/valgrind-remote-unversioned-rse-dependency.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sun, 22 Apr 2012 00:48:53 +0200
-Subject: valgrind-remote-unversioned-rse-dependency
-
----
- .../META-INF/MANIFEST.MF                           |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/profiling/org.eclipse.linuxtools.profiling.launch.remote/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.launch.remote/META-INF/MANIFEST.MF
-index 58d8e32..a2158e5 100644
---- a/profiling/org.eclipse.linuxtools.profiling.launch.remote/META-INF/MANIFEST.MF
-+++ b/profiling/org.eclipse.linuxtools.profiling.launch.remote/META-INF/MANIFEST.MF
-@@ -7,12 +7,12 @@ Bundle-Activator: org.eclipse.linuxtools.internal.profiling.launch.remote.Profil
- Bundle-Vendor: %Bundle-Vendor
- Require-Bundle: org.eclipse.ui,
-  org.eclipse.core.runtime,
-- org.eclipse.rse.core;bundle-version="3.2.0",
-- org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100",
-- org.eclipse.rse;bundle-version="3.3.0",
-- org.eclipse.rse.subsystems.processes.core;bundle-version="3.1.200",
-- org.eclipse.rse.subsystems.shells.core;bundle-version="3.1.200",
-- org.eclipse.rse.services;bundle-version="3.2.100"
-+ org.eclipse.rse.core,
-+ org.eclipse.rse.subsystems.files.core,
-+ org.eclipse.rse,
-+ org.eclipse.rse.subsystems.processes.core,
-+ org.eclipse.rse.subsystems.shells.core,
-+ org.eclipse.rse.services
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Bundle-ActivationPolicy: lazy
- Import-Package: org.eclipse.cdt.debug.core,

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