[bsh] 22/50: Build-depend on libservlet2.5-java instead of libservlet2.4-java.

[Emmanuel Bourg]

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

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

commit c063241a877dd31f6077d26a3fb97eb5ed1ed505
Author: Thierry Carrez <thierry.carrez at ubuntu.com>
Date:   Fri Jun 11 14:21:39 2010 +0000

    Build-depend on libservlet2.5-java instead of libservlet2.4-java.
---
 debian/changelog | 6 ++++++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9050a6..1efc22d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bsh (2.0b4-12) UNRELEASED; urgency=low
+
+  * Build-depend on libservlet2.5-java instead of libservlet2.4-java.
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Fri, 11 Jun 2010 16:20:23 +0200
+
 bsh (2.0b4-11) unstable; urgency=low
 
   [ Ludovic Claude ]
diff --git a/debian/control b/debian/control
index 2a49afa..cab8a86 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep, ant, libservlet2.4-java, libbsf-java, javacc, maven-repo-helper
+Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep, ant, libservlet2.5-java, libbsf-java, javacc, maven-repo-helper
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bsh
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/bsh
@@ -12,7 +12,7 @@ Homepage: http://www.beanshell.org/
 Package: bsh
 Architecture: all
 Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless, libjline-java
-Suggests: libservlet2.4-java, bsh-doc, default-jre | java1-runtime | java2-runtime
+Suggests: libservlet2.5-java, bsh-doc, default-jre | java1-runtime | java2-runtime
 Enhances: libbsf-java
 Recommends: bsh-gcj
 Description: Java scripting environment (BeanShell) Version 2
diff --git a/debian/rules b/debian/rules
index f76d0d0..760ef98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/class/ant.mk
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := servlet-api-2.4 bsf javacc
+DEB_JARS             := servlet-api-2.5 bsf javacc
 DEB_ANT_BUILD_TARGET := javadoc jarall test
 
 include /usr/share/gcj/debian_defaults

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