[libxbean-java] 04/06: Fixed a compilation error with Spring 4.0

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libxbean-java.

commit ebe5f4cc637ea053fcc178a51d24d6a26266d92e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 11 00:29:50 2016 +0200

    Fixed a compilation error with Spring 4.0
---
 debian/changelog                          |  1 +
 debian/patches/bootstrap.series           |  1 +
 debian/patches/full.series                |  1 +
 debian/patches/spring-compatibility.patch | 14 ++++++++++++++
 4 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 270c870..73cae75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxbean-java (4.5-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed a compilation error with Spring 4.0
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* URLs
diff --git a/debian/patches/bootstrap.series b/debian/patches/bootstrap.series
index 093e9f7..4444f83 100644
--- a/debian/patches/bootstrap.series
+++ b/debian/patches/bootstrap.series
@@ -2,3 +2,4 @@ bootstrap.diff
 bundle.diff
 modules.diff
 DelegatingBundleContext.patch
+spring-compatibility.patch
diff --git a/debian/patches/full.series b/debian/patches/full.series
index bcb3209..3ae49a1 100644
--- a/debian/patches/full.series
+++ b/debian/patches/full.series
@@ -2,3 +2,4 @@ bundle.diff
 modules.diff
 DelegatingBundleContext.patch
 disable-javadoc-linksource.patch
+spring-compatibility.patch
diff --git a/debian/patches/spring-compatibility.patch b/debian/patches/spring-compatibility.patch
new file mode 100644
index 0000000..e1e0724
--- /dev/null
+++ b/debian/patches/spring-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of Spring in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java
++++ b/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java
+@@ -131,7 +131,7 @@
+             BeanDefinitionParserDelegate.INIT_METHOD_ATTRIBUTE, 
+             BeanDefinitionParserDelegate.DESTROY_METHOD_ATTRIBUTE,
+             BeanDefinitionParserDelegate.ABSTRACT_ATTRIBUTE, 
+-            BeanDefinitionParserDelegate.SINGLETON_ATTRIBUTE, 
++            "singleton", 
+             BeanDefinitionParserDelegate.LAZY_INIT_ATTRIBUTE };
+ 
+     private static final String JAVA_PACKAGE_PREFIX = "java://";

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