[SCM] eclipse-emf - Plug-in for eclipse - Debian package. branch, master, updated. debian/2.5.0-2-15-gc5cbb14

[Jakub Adam]

The following commit has been merged in the master branch:
commit 7d3745925b572ebbe016484ddcc53f91e3fea02e
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Aug 11 22:55:52 2012 +0200

    Ignore nonexistent org.eclipse.emf.doc.source feature

diff --git a/debian/changelog b/debian/changelog
index 3ffae62..db5fed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ eclipse-emf (2.8.0-1) UNRELEASED; urgency=low
   * Removed d/patches/Unchecked-generic-class-cast.patch
     (applied upstream).
   * Refreshed patches for new upstream release.
+  * Ignore nonexistent org.eclipse.emf.doc.source feature.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 11 Aug 2012 20:53:50 +0200
 
diff --git a/debian/patches/ignore-o.e.emf.doc.source.patch b/debian/patches/ignore-o.e.emf.doc.source.patch
new file mode 100644
index 0000000..21ee39b
--- /dev/null
+++ b/debian/patches/ignore-o.e.emf.doc.source.patch
@@ -0,0 +1,24 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sat, 11 Aug 2012 21:15:07 +0200
+Subject: ignore-o.e.emf.doc.source
+
+---
+ features/org.eclipse.emf.sdk-feature/feature.xml |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/features/org.eclipse.emf.sdk-feature/feature.xml b/features/org.eclipse.emf.sdk-feature/feature.xml
+index 953e84b..4ab9584 100644
+--- a/features/org.eclipse.emf.sdk-feature/feature.xml
++++ b/features/org.eclipse.emf.sdk-feature/feature.xml
+@@ -41,9 +41,9 @@ http://www.eclipse.org/legal/epl-v10.html
+          id="org.eclipse.emf.doc"
+          version="0.0.0"/>
+ 
+-   <includes
++   <!--includes
+          id="org.eclipse.emf.doc.source"
+-         version="0.0.0"/>
++         version="0.0.0"/-->
+ 
+    <plugin
+          id="org.eclipse.emf.example.installer"
diff --git a/debian/patches/series b/debian/patches/series
index 0e6af9b..14999bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Fedora-eclipse-emf-symlinked-classpath.patch
 Fedora-eclipse-emf-build-props.patch
 Fedora-eclipse-emf-bundle-examples.patch
 unix2dos.patch
+ignore-o.e.emf.doc.source.patch

-- 
eclipse-emf - Plug-in for eclipse - Debian package.