[SCM] Spring Security 2.0: Java libraries that provide security services for the Spring Framework branch, master, updated. debian/2.0.6.RELEASE-1-1-g803441f

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 803441f80d724615af20b005830c110e36448065
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sat Jan 14 14:48:38 2012 -0430

    Fix FTBFS bug

diff --git a/debian/changelog b/debian/changelog
index 1f71de6..36651f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libspring-security-2.0-java (2.0.6.RELEASE-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS by switching to libservlet2.5-java and updating library paths.
+    (Closes: #655821). 
+  * Bump Standards-Version to 3.9.2. No changes were required.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sat, 14 Jan 2012 14:38:11 -0430
+
 libspring-security-2.0-java (2.0.6.RELEASE-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/classpath-debian b/debian/classpath-debian
index bfb40ad..3fc945c 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -6,7 +6,7 @@ usr/share/java/commons-collections.jar
 usr/share/java/commons-logging.jar
 usr/share/java/ehcache.jar
 usr/share/java/jaxen.jar
-usr/share/java/servlet-api.jar
+usr/share/java/servlet-api-2.5.jar
 usr/share/java/spring-aop.jar
 usr/share/java/spring-beans.jar
 usr/share/java/spring-context.jar
@@ -28,4 +28,4 @@ usr/share/java/spring-webmvc-portlet.jar
 usr/share/java/portlet-api.jar
 
 # spring-security-taglibs
-usr/share/java/jsp-api.jar
+usr/share/java/jsp-api-2.1.jar
diff --git a/debian/control b/debian/control
index 9e979e2..796e352 100644
--- a/debian/control
+++ b/debian/control
@@ -10,16 +10,16 @@ Build-Depends: debhelper (>= 7.0.50), ant, default-jdk, javahelper,
  libspring-context-2.5-java, libspring-core-2.5-java, libspring-ldap-java,
  libspring-test-2.5-java, libspring-tx-2.5-java, libspring-web-2.5-java,
  libjboss-ejb3x-java, libjcifs-java, libspring-webmvc-portlet-2.5-java,
- libspring-jdbc-2.5-java, libportlet-api-2.0-spec-java, libservlet2.4-java,
+ libspring-jdbc-2.5-java, libportlet-api-2.0-spec-java, libservlet2.5-java,
  xmlto, fop
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://static.springsource.org/spring-security/site/index.html
 Vcs-Git: git://git.debian.org/git/pkg-java/libspring-security-2.0-java.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/libspring-security-2.0-java.git
 
 Package: libspring-security-core-2.0-java
 Architecture: all
-Depends: libservlet2.4-java, libehcache-java, libaopalliance-java,
+Depends: libservlet2.5-java, libehcache-java, libaopalliance-java,
  libcommons-codec-java, libcommons-collections-java, libcommons-logging-java,
  aspectj, libjaxen-java, libspring-aop-2.5-java, libspring-beans-2.5-java,
  libspring-tx-2.5-java, libspring-jdbc-2.5-java, libspring-ldap-java,
@@ -86,7 +86,7 @@ Description: modular Java/J2EE application security framework - ACL
 
 Package: libspring-security-ntlm-2.0-java
 Architecture: all
-Depends: libservlet2.4-java, libjcifs-java, libcommons-logging-java,
+Depends: libservlet2.5-java, libjcifs-java, libcommons-logging-java,
  libspring-beans-2.5-java, libspring-ldap-java, libspring-core-2.5-java,
  libspring-security-core-2.0-java, ${misc:Depends}
 Recommends: libspring-security-2.0-java-doc (= ${binary:Version})
@@ -153,7 +153,7 @@ Description: modular Java/J2EE application security framework - Portlet
 
 Package: libspring-security-taglibs-2.0-java
 Architecture: all
-Depends: libservlet2.4-java, libcommons-logging-java, libspring-beans-2.5-java,
+Depends: libservlet2.5-java, libcommons-logging-java, libspring-beans-2.5-java,
  libspring-context-2.5-java, libspring-core-2.5-java, libspring-web-2.5-java,
  libspring-webmvc-2.5-java, libspring-webmvc-portlet-2.5-java,
  libspring-security-core-2.0-java, ${misc:Depends}

-- 
Spring Security 2.0: Java libraries that provide security services for the Spring Framework