[sisu-ioc] 01/01: fix for #737591

[Eugene Zhukov]

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

eugene-guest pushed a commit to branch master
in repository sisu-ioc.

commit 8864741681bad445fc4395b68cedb7a062b7b17d
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date:   Wed Feb 12 12:33:20 2014 +0000

    fix for #737591
---
 debian/changelog                               |  8 ++++++++
 debian/control                                 |  2 +-
 debian/patches/classworlds_compatibility.patch | 16 ++++++++++++++++
 debian/patches/series                          |  1 +
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 52b58b3..d50c5eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sisu-ioc (2.3.0-5) unstable; urgency=medium
+
+  * Team upload.
+  * Added patch to address FTBFS issue (Closes: #737591)
+  * Updated Standards-Version to 3.9.5 (no changes)
+
+ -- Eugene Zhukov <jevgeni.zh at gmail.com>  Wed, 12 Feb 2014 11:55:37 +0000
+
 sisu-ioc (2.3.0-4) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 95ee097..1125cd8 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends-Indep: default-jdk-doc,
                      libplexus-utils2-java-doc,
                      libsisu-guice-java,
                      testng (>= 6.8.7)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/sisu-ioc.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/sisu-ioc.git
 Homepage: http://sisu.sonatype.org
diff --git a/debian/patches/classworlds_compatibility.patch b/debian/patches/classworlds_compatibility.patch
new file mode 100644
index 0000000..8b7f09c
--- /dev/null
+++ b/debian/patches/classworlds_compatibility.patch
@@ -0,0 +1,16 @@
+Description: plexus-classworlds compatibility
+Author: Eugene Zhukov <jevgeni.zh at gmail.com>
+Bug-Debian: http://bugs.debian.org/737591
+Last-Update: 2014-02-12
+
+--- sisu-ioc-2.3.0.orig/sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
++++ sisu-ioc-2.3.0/sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+@@ -190,7 +190,7 @@ public class ComponentDescriptor<T>
+     {
+         try
+         {
+-            return classRealm.loadClass( getRole() );
++            return (Class<T>) classRealm.loadClass( getRole() );
+         }
+         catch ( final Exception e )
+         {
diff --git a/debian/patches/series b/debian/patches/series
index fde8eb1..5867ad7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+classworlds_compatibility.patch
 fix_osgi43.diff
 version_plexus.diff
 guice_classifier.diff

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