This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository bsh.
commit 2a87c8644c66322536c298af77f311cff3e42fe3
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Thu Nov 21 16:25:25 2013 +0000
Transition to the Servlet API 3.0 (Closes: #729972)
---
debian/changelog | 1 +
debian/control | 6 +++---
debian/patches/05_link_javadoc.patch | 2 +-
debian/rules | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 537efb5..1798745 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
bsh (2.0b4-15) unstable; urgency=low
* Added the poms missing in the previous upload (Closes: #730008)
+ * Transition to the Servlet API 3.0 (Closes: #729972)
-- Emmanuel Bourg <ebo...@apache.org> Thu, 21 Nov 2013 17:16:04 +0100
diff --git a/debian/control b/debian/control
index 78ca66d..db27e06 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends: ant,
javacc,
javahelper (>= 0.32~),
libbsf-java,
- libservlet2.5-java,
- libservlet2.5-java-doc,
+ libservlet3.0-java,
+ libservlet3.0-java-doc,
maven-repo-helper
Standards-Version: 3.9.5
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/bsh
@@ -23,7 +23,7 @@ Package: bsh
Architecture: all
Depends: default-jre-headless | java1-runtime-headless |
java2-runtime-headless,
libjline-java, libbsh-java (= ${source:Version}), ${misc:Depends}
-Suggests: bsh-doc, default-jre | java1-runtime | java2-runtime,
libservlet2.5-java
+Suggests: bsh-doc, default-jre | java1-runtime | java2-runtime,
libservlet3.0-java
Enhances: libbsf-java
Description: Java scripting environment (BeanShell) Version 2
BeanShell is a small, free, embeddable, Java source interpreter with object
diff --git a/debian/patches/05_link_javadoc.patch
b/debian/patches/05_link_javadoc.patch
index 2798aa4..773b111 100644
--- a/debian/patches/05_link_javadoc.patch
+++ b/debian/patches/05_link_javadoc.patch
@@ -11,7 +11,7 @@ Author: Niels Thykier <ni...@thykier.net>
+ >
+ <link href="/usr/share/doc/default-jdk-doc/api/" />
+ <link href="/usr/share/doc/libbsf-java/api/" />
-+ <link href="/usr/share/doc/libservlet2.5-java/api/" />
++ <link href="/usr/share/doc/libservlet3.0-java/api/" />
+ </javadoc>
</target>
diff --git a/debian/rules b/debian/rules
index 84f67c7..f3bbea1 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.5 bsf javacc
+DEB_JARS := servlet-api-3.0 bsf javacc
DEB_ANT_BUILD_TARGET := javadoc jarall test
ANT_OPTS = -Dcompile.debug=true
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/bsh.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
