[pkg-java] r17806 - trunk/javahelp2/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-02-21 10:52:42 +0000 (Fri, 21 Feb 2014)
New Revision: 17806

Modified:
   trunk/javahelp2/debian/changelog
   trunk/javahelp2/debian/control
   trunk/javahelp2/debian/rules
Log:
Switch to Servlet API 3.0



Modified: trunk/javahelp2/debian/changelog
===================================================================
--- trunk/javahelp2/debian/changelog	2014-02-21 10:43:53 UTC (rev 17805)
+++ trunk/javahelp2/debian/changelog	2014-02-21 10:52:42 UTC (rev 17806)
@@ -1,6 +1,7 @@
 javahelp2 (2.0.05.ds1-7) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Switch to Servlet API 3.0
   * debian/control:
     - Removed the unused build dependency on libtomcat6-java
     - Standards-Version updated to 3.9.5 (no changes)

Modified: trunk/javahelp2/debian/control
===================================================================
--- trunk/javahelp2/debian/control	2014-02-21 10:43:53 UTC (rev 17805)
+++ trunk/javahelp2/debian/control	2014-02-21 10:52:42 UTC (rev 17806)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marek Slama <marek.slama at sun.com>, Varun Hiremath <varun at debian.org>
 Build-Depends: cdbs, debhelper (>= 9), maven-repo-helper
-Build-Depends-Indep: ant-optional, default-jdk, libservlet2.5-java, imagemagick
+Build-Depends-Indep: ant-optional, default-jdk, libservlet3.0-java, imagemagick
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/javahelp2
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/javahelp2

Modified: trunk/javahelp2/debian/rules
===================================================================
--- trunk/javahelp2/debian/rules	2014-02-21 10:43:53 UTC (rev 17805)
+++ trunk/javahelp2/debian/rules	2014-02-21 10:52:42 UTC (rev 17806)
@@ -25,8 +25,8 @@
 stamp-build-$(p_jh):
 	#Create symlink to required jars
 	mkdir -p $(DEB_SRCDIR)/javahelp_nbproject/lib
-	ln -s -f /usr/share/java/servlet-api-2.5.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/servlet-api.jar
-	ln -s -f /usr/share/java/jsp-api-2.1.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/jsp-api.jar
+	ln -s -f /usr/share/java/servlet-api-3.0.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/servlet-api.jar
+	ln -s -f /usr/share/java/jsp-api-2.2.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/jsp-api.jar
 	#Remove class uncompilable without JDIC
 	rm -f $(DEB_SRCDIR)/jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java
 	#Build javahelp target 'release' is for jars, target 'javadoc' is for javadoc