This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository shiro.
commit 38ce229bef497696c07f6fe15ee91af46776aa9f Author: Emmanuel Bourg <[email protected]> Date: Wed Nov 16 15:11:15 2016 +0100 Depend on libtaglibs-standard-spec-java instead of libjstl1.1-java --- debian/changelog | 1 + debian/control | 6 +++--- debian/maven.rules | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index baf7186..0a0a1a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ shiro (1.2.5-3) UNRELEASED; urgency=medium * Team upload. + * Depend on libtaglibs-standard-spec-java instead of libjstl1.1-java * Switch to debhelper level 10 -- Emmanuel Bourg <[email protected]> Wed, 16 Nov 2016 14:57:43 +0100 diff --git a/debian/control b/debian/control index 78685d3..517da29 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends-Indep: libaspectj-java, libcommons-beanutils-java, libcommons-cli-java, libehcache-java, - libjstl1.1-java, libguice-java (>= 3.0-6~), libhsqldb-java, liblog4j1.2-java, @@ -17,7 +16,8 @@ Build-Depends-Indep: libaspectj-java, libquartz-java, libservlet3.1-java, libslf4j-java, - libspring-context-java + libspring-context-java, + libtaglibs-standard-spec-java Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/shiro.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/shiro.git @@ -26,7 +26,7 @@ Homepage: http://shiro.apache.org Package: libshiro-java Architecture: all Depends: ${misc:Depends}, libcommons-beanutils-java, libslf4j-java -Suggests: libaspectj-java, libcommons-cli-java, libehcache-java, libjstl1.1-java, libquartz-java, libspring-context-java +Suggests: libaspectj-java, libcommons-cli-java, libehcache-java, libtaglibs-standard-spec-java, libquartz-java, libspring-context-java Description: Apache Shiro - Java Security Framework Apache Shiro is a powerful and flexible open-source security framework that cleanly handles authentication, authorization, enterprise session diff --git a/debian/maven.rules b/debian/maven.rules index 3abfa31..af8d840 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -3,7 +3,7 @@ s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * * s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * * s/aspectj/org.aspectj/ aspectjweaver jar s/.*/debian/ * * commons-beanutils commons-beanutils jar s/.*/debian/ * * -javax.servlet jstl jar s/.*/1.1/ * * +s/javax.servlet/org.apache.taglibs/ s/jstl/taglibs-standard-spec/ jar s/.*/debian/ * * javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * * javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * * junit junit jar s/4\..*/4.x/ * * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/shiro.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
