[SCM] eclipse-linuxtools packaging branch, master, updated. upstream/1.0.0-28-ge040b5c

Jakub Adam jakub.adam at ktknet.cz
Thu Jun 28 17:39:23 UTC 2012


The following commit has been merged in the master branch:
commit e040b5c016cea3f1e46822c035169b7eaea6740b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jun 27 23:04:57 2012 +0200

    Drop d/patches/valgrind-remove-unused-emf-dependency.patch
    
    Included upstream.

diff --git a/debian/changelog b/debian/changelog
index e5a2f15..979fce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ eclipse-linuxtools (1.0.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Remove eclipse-cdt-autotools binary package.
     - The code moved to Eclipse CDT.
+  * Drop d/patches/valgrind-remove-unused-emf-dependency.patch
+    - Included upstream.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 27 Jun 2012 22:49:46 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index b38c0d7..bb35633 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 valgrind-add-swtchart.patch
-valgrind-remove-unused-emf-dependency.patch
 valgrind-remote-unversioned-rse-dependency.patch
 remote-profiling-disable-rdt-proxy.patch
 libhover-fix-automake-texinfo-parser.patch
diff --git a/debian/patches/valgrind-remove-unused-emf-dependency.patch b/debian/patches/valgrind-remove-unused-emf-dependency.patch
deleted file mode 100644
index 51e1bb5..0000000
--- a/debian/patches/valgrind-remove-unused-emf-dependency.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sun, 22 Apr 2012 00:16:49 +0200
-Subject: valgrind-remove-unused-emf-dependency
-
----
- .../META-INF/MANIFEST.MF                           |    3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
-index 797081e..365c725 100644
---- a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
-+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
-@@ -18,9 +18,6 @@ Import-Package: org.eclipse.cdt.debug.core,
-  org.eclipse.debug.core.model,
-  org.eclipse.debug.core.sourcelookup,
-  org.eclipse.debug.ui,
-- org.eclipse.emf.common,
-- org.eclipse.emf.common.util,
-- org.eclipse.emf.ecore,
-  org.eclipse.jface.text,
-  org.eclipse.linuxtools.profiling.ui,
-  org.eclipse.linuxtools.valgrind.core,

-- 
eclipse-linuxtools packaging



More information about the pkg-java-commits mailing list