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

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-12-23 00:02:25 +0000 (Fri, 23 Dec 2011)
New Revision: 15580

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


Modified: trunk/javahelp2/debian/changelog
===================================================================
--- trunk/javahelp2/debian/changelog	2011-12-22 22:53:00 UTC (rev 15579)
+++ trunk/javahelp2/debian/changelog	2011-12-23 00:02:25 UTC (rev 15580)
@@ -1,3 +1,11 @@
+javahelp2 (2.0.05.ds1-6) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Switch to Servlet API 2.5. (Closes: #652256).
+  * Bump Standards-Version to 3.9.2. No changes were required.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 22 Dec 2011 19:23:33 -0430
+
 javahelp2 (2.0.05.ds1-5) unstable; urgency=low
 
   * Team upload

Modified: trunk/javahelp2/debian/control
===================================================================
--- trunk/javahelp2/debian/control	2011-12-22 22:53:00 UTC (rev 15579)
+++ trunk/javahelp2/debian/control	2011-12-23 00:02:25 UTC (rev 15580)
@@ -5,8 +5,8 @@
 Uploaders: Marek Slama <marek.slama at sun.com>, Varun Hiremath <varun at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), maven-repo-helper
 Build-Depends-Indep: ant-optional, default-jdk,
- libtomcat6-java, libservlet2.4-java, imagemagick
-Standards-Version: 3.9.1
+ libtomcat6-java, libservlet2.5-java, imagemagick
+Standards-Version: 3.9.2
 Homepage: http://javahelp.dev.java.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javahelp2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/javahelp2

Modified: trunk/javahelp2/debian/rules
===================================================================
--- trunk/javahelp2/debian/rules	2011-12-22 22:53:00 UTC (rev 15579)
+++ trunk/javahelp2/debian/rules	2011-12-23 00:02:25 UTC (rev 15580)
@@ -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.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/servlet-api.jar
-	ln -s -f /usr/share/java/jsp-api.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/jsp-api.jar
+	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
 	#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