[pkg-java] r12552 - trunk/bsh/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2010-06-11 14:21:39 +0000 (Fri, 11 Jun 2010)
New Revision: 12552

Modified:
   trunk/bsh/debian/changelog
   trunk/bsh/debian/control
   trunk/bsh/debian/rules
Log:
Build-depend on libservlet2.5-java instead of libservlet2.4-java.

Modified: trunk/bsh/debian/changelog
===================================================================
--- trunk/bsh/debian/changelog	2010-06-11 14:17:25 UTC (rev 12551)
+++ trunk/bsh/debian/changelog	2010-06-11 14:21:39 UTC (rev 12552)
@@ -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 ]

Modified: trunk/bsh/debian/control
===================================================================
--- trunk/bsh/debian/control	2010-06-11 14:17:25 UTC (rev 12551)
+++ trunk/bsh/debian/control	2010-06-11 14:21:39 UTC (rev 12552)
@@ -3,7 +3,7 @@
 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 @@
 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

Modified: trunk/bsh/debian/rules
===================================================================
--- trunk/bsh/debian/rules	2010-06-11 14:17:25 UTC (rev 12551)
+++ trunk/bsh/debian/rules	2010-06-11 14:21:39 UTC (rev 12552)
@@ -7,7 +7,7 @@
 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