[sisu-inject] 03/08: Removed 04-fix-compatibility.patch (fixed upstream)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository sisu-inject.

commit 07c7c1cf40d25f2b2514eecadbac32beb9424755
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 6 13:42:29 2015 +0200

    Removed 04-fix-compatibility.patch (fixed upstream)
---
 debian/changelog                          |  4 +++-
 debian/patches/04-fix-compatibility.patch | 16 ----------------
 debian/patches/series                     |  2 --
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0398c3..e372ed5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-sisu-inject (0.0.0.M5-2) UNRELEASED; urgency=medium
+sisu-inject (0.3.1-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Removed 04-fix-compatibility.patch (fixed upstream)
   * Removed the unused build dependency on libfelix-framework-java
   * debian/copyright: Fixed the Source URL
 
diff --git a/debian/patches/04-fix-compatibility.patch b/debian/patches/04-fix-compatibility.patch
deleted file mode 100644
index 59ebff8..0000000
--- a/debian/patches/04-fix-compatibility.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix a type cast error probably caused by a mislaligned dependency (guice?)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/InjectorPublisher.java
-+++ b/org.eclipse.sisu.inject/src/org/eclipse/sisu/inject/InjectorPublisher.java
-@@ -137,8 +137,9 @@
-     private void publishBindings( final TypeLiteral searchType, final BindingSubscriber subscriber,
-                                   final TypeLiteral superType )
-     {
--        for ( final Binding binding : injector.<Object> findBindingsByType( searchType ) )
-+        for ( final Object obj : injector.<Object> findBindingsByType( searchType ) )
-         {
-+            Binding binding = (Binding) obj;
-             if ( isVisible( binding ) && ( null == superType || isAssignableFrom( superType, binding ) ) )
-             {
-                 subscriber.add( binding, function.rank( binding ) );
diff --git a/debian/patches/series b/debian/patches/series
index 4908309..404feb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 01-drop-maven3-prereq.patch
-
 02-change-packaging-type.patch
 03-add-missing-dependencies.patch
-04-fix-compatibility.patch

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