[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 d7386117b192872e5d1194dfff313088600560ed
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Aug 11 22:45:23 2012 +0200

    Removed d/patches/Unchecked-generic-class-cast.patch
    
    Applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 8553a58..dc8c505 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ eclipse-emf (2.8.0-1) UNRELEASED; urgency=low
   * Add d/eclipse.environment to reflect new upstream source layout.
   * Remove XSD packages because upstream split the project repositories.
   * d/control: set context qualifier to 'dist'.
+  * Removed d/patches/Unchecked-generic-class-cast.patch
+    (applied upstream).
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 11 Aug 2012 20:53:50 +0200
 
diff --git a/debian/patches/Unchecked-generic-class-cast.patch b/debian/patches/Unchecked-generic-class-cast.patch
deleted file mode 100644
index 9b6202f..0000000
--- a/debian/patches/Unchecked-generic-class-cast.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/ContentHandlerRegistryReader.java b/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/ContentHandlerRegistryReader.java
-index cdbfae0..06be38d 100644
---- a/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/ContentHandlerRegistryReader.java
-+++ b/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/ContentHandlerRegistryReader.java
-@@ -73,7 +73,7 @@ class ContentHandlerRegistryReader extends RegistryReader
-           try
-           {
-             @SuppressWarnings("unchecked")
--            Class<ContentHandler> contributorHandlerClass = Platform.getBundle(element.getNamespaceIdentifier()).loadClass(contributorClassName);
-+            Class<ContentHandler> contributorHandlerClass = (Class)Platform.getBundle(element.getNamespaceIdentifier()).loadClass(contributorClassName);
-             Map<String, String> parameters = new HashMap<String, String>();
-             for (IConfigurationElement parameter : element.getChildren("parameter"))
-             {
diff --git a/debian/patches/series b/debian/patches/series
index ba86678..0e6af9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ Fedora-eclipse-emf-symlinked-classpath.patch
 Fedora-eclipse-emf-build-props.patch
 Fedora-eclipse-emf-bundle-examples.patch
 unix2dos.patch
-Unchecked-generic-class-cast.patch

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