From cb388a9b4969cf63f4fe489cd051b4ff8f1b0efb Mon Sep 17 00:00:00 2001 From: Emmanuel Bourg <ebourg@apache.org> Date: Fri, 3 Jun 2016 14:10:13 +0200 Subject: [PATCH] Transition to the Servlet API 3.1 --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1bc105..3e88998 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +javahelp2 (2.0.05.ds1-9) UNRELEASED; urgency=medium + + * Team upload. + * Transition to the Servlet API 3.1 + + -- Emmanuel Bourg <ebourg@apache.org> Fri, 03 Jun 2016 14:09:55 +0200 + javahelp2 (2.0.05.ds1-8) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 4279484..fc0111f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Marek Slama <marek.slama@sun.com>, Varun Hiremath <varun@debian.org> Build-Depends: cdbs, debhelper (>= 9), maven-repo-helper -Build-Depends-Indep: ant-optional, default-jdk, libservlet3.0-java, imagemagick +Build-Depends-Indep: ant-optional, default-jdk, libservlet3.1-java, imagemagick Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/javahelp2.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/javahelp2.git diff --git a/debian/rules b/debian/rules index 7d3230c..6b2fcc5 100755 --- a/debian/rules +++ b/debian/rules @@ -25,8 +25,8 @@ build/$(p_jh):: stamp-build-$(p_jh) stamp-build-$(p_jh): #Create symlink to required jars mkdir -p $(DEB_SRCDIR)/javahelp_nbproject/lib - 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 + ln -s -f /usr/share/java/servlet-api-3.1.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/servlet-api.jar + ln -s -f /usr/share/java/jsp-api-2.3.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 -- GitLab