[pkg-java] r17483 - in trunk/bsh/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-11-21 16:25:25 +0000 (Thu, 21 Nov 2013)
New Revision: 17483

Modified:
   trunk/bsh/debian/changelog
   trunk/bsh/debian/control
   trunk/bsh/debian/patches/05_link_javadoc.patch
   trunk/bsh/debian/rules
Log:
Transition to the Servlet API 3.0 (Closes: #729972)



Modified: trunk/bsh/debian/changelog
===================================================================
--- trunk/bsh/debian/changelog	2013-11-21 16:17:13 UTC (rev 17482)
+++ trunk/bsh/debian/changelog	2013-11-21 16:25:25 UTC (rev 17483)
@@ -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 <ebourg at apache.org>  Thu, 21 Nov 2013 17:16:04 +0100
 

Modified: trunk/bsh/debian/control
===================================================================
--- trunk/bsh/debian/control	2013-11-21 16:17:13 UTC (rev 17482)
+++ trunk/bsh/debian/control	2013-11-21 16:25:25 UTC (rev 17483)
@@ -11,8 +11,8 @@
                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 @@
 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

Modified: trunk/bsh/debian/patches/05_link_javadoc.patch
===================================================================
--- trunk/bsh/debian/patches/05_link_javadoc.patch	2013-11-21 16:17:13 UTC (rev 17482)
+++ trunk/bsh/debian/patches/05_link_javadoc.patch	2013-11-21 16:25:25 UTC (rev 17483)
@@ -11,7 +11,7 @@
 +		>
 +                  <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>
  

Modified: trunk/bsh/debian/rules
===================================================================
--- trunk/bsh/debian/rules	2013-11-21 16:17:13 UTC (rev 17482)
+++ trunk/bsh/debian/rules	2013-11-21 16:25:25 UTC (rev 17483)
@@ -7,7 +7,7 @@
 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