This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 7287c8252b4d6b6a15fbf9653aaa46053b23531b Author: Emmanuel Bourg <[email protected]> Date: Tue Jul 26 11:43:01 2016 +0200 Depend on taglibs-standard instead of jakarta-taglibs-standard --- debian/changelog | 1 + debian/control | 8 ++++---- debian/rules | 4 ++-- debian/tomcat8-examples.links | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 75ec04e..52e75ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ tomcat8 (8.0.36-2) UNRELEASED; urgency=medium * Team upload. * Removed the default 128M heap limit (LP: #568823) + * Depend on taglibs-standard instead of jakarta-taglibs-standard -- Emmanuel Bourg <[email protected]> Thu, 21 Jul 2016 14:26:01 +0200 diff --git a/debian/control b/debian/control index 7cd0713..4edf82f 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends-Indep: javahelper, libeasymock-java (>= 3.0), libecj-java (>= 3.11.0), libhamcrest-java (>= 1.3), - libjakarta-taglibs-standard-java, - libjstl1.1-java, + libtaglibs-standard-spec-java, + libtaglibs-standard-impl-java, libobjenesis-java, lsb-release, maven-repo-helper @@ -124,8 +124,8 @@ Description: Apache Tomcat 8 - Servlet and JSP engine -- admin web applications Package: tomcat8-examples Architecture: all -Depends: libjakarta-taglibs-standard-java, - libjstl1.1-java, +Depends: libtaglibs-standard-spec-java, + libtaglibs-standard-impl-java, tomcat8-common (>= ${source:Version}), ${misc:Depends} Description: Apache Tomcat 8 - Servlet and JSP engine -- example web applications diff --git a/debian/rules b/debian/rules index bcfed1e..5c7419c 100755 --- a/debian/rules +++ b/debian/rules @@ -27,8 +27,8 @@ override_dh_auto_build: override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) mkdir -p webapps/examples/WEB-INF/lib - cp /usr/share/java/jstl1.1.jar webapps/examples/WEB-INF/lib/jstl.jar - cp /usr/share/java/standard.jar webapps/examples/WEB-INF/lib/standard.jar + cp /usr/share/java/taglibs-standard-spec.jar webapps/examples/WEB-INF/lib/ + cp /usr/share/java/taglibs-standard-impl.jar webapps/examples/WEB-INF/lib/ $(ANT) test endif diff --git a/debian/tomcat8-examples.links b/debian/tomcat8-examples.links index 32f3553..1521779 100644 --- a/debian/tomcat8-examples.links +++ b/debian/tomcat8-examples.links @@ -1,2 +1,2 @@ -/usr/share/java/jstl1.1.jar /usr/share/tomcat8-examples/examples/WEB-INF/lib/jstl.jar -/usr/share/java/standard.jar /usr/share/tomcat8-examples/examples/WEB-INF/lib/standard.jar +/usr/share/java/taglibs-standard-spec.jar /usr/share/tomcat8-examples/examples/WEB-INF/lib/taglibs-standard-spec.jar +/usr/share/java/taglibs-standard-impl.jar /usr/share/tomcat8-examples/examples/WEB-INF/lib/taglibs-standard-impl.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
