[jspwiki] 04/05: Depend on libtaglibs-standard-{spec, impl}-java instead of libjstl1.1-java and libjakarta-taglibs-standard-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jspwiki.

commit 451126829c8154a4a0e4e90dcec3537b59260d30
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Dec 3 23:11:47 2016 +0100

    Depend on libtaglibs-standard-{spec,impl}-java instead of libjstl1.1-java and libjakarta-taglibs-standard-java
---
 debian/changelog     | 2 ++
 debian/control       | 8 ++++----
 debian/jspwiki.links | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e32966c..f3c7439 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 jspwiki (2.8.0-7) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libtaglibs-standard-{spec,impl}-java instead of libjstl1.1-java
+    and libjakarta-taglibs-standard-java
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 8b568e7..090e4e6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,16 +11,16 @@ Build-Depends-Indep: libcommons-codec-java,
                      libcommons-lang-java,
                      libjabsorb-java,
                      libjakarta-ecs-java,
-                     libjakarta-taglibs-standard-java,
                      libjaxen-java,
                      libjdom1-java,
-                     libjstl1.1-java,
                      liblog4j1.2-java,
                      liblucene2-java,
                      libmail-java,
                      libnekohtml-java,
                      liboro-java,
                      liboscache-java,
+                     libtaglibs-standard-spec-java,
+                     libtaglibs-standard-impl-java,
                      tomcat8,
                      unzip,
                      yui-compressor,
@@ -40,16 +40,16 @@ Depends: libcommons-codec-java,
          libcommons-logging-java,
          libjabsorb-java,
          libjakarta-ecs-java,
-         libjakarta-taglibs-standard-java,
          libjaxen-java,
          libjdom1-java,
-         libjstl1.1-java,
          liblog4j1.2-java,
          liblucene2-java,
          libmail-java,
          libnekohtml-java,
          liboro-java,
          liboscache-java,
+         libtaglibs-standard-spec-java,
+         libtaglibs-standard-impl-java,
          tomcat8,
          ${misc:Depends}
 Suggests: rcs
diff --git a/debian/jspwiki.links b/debian/jspwiki.links
index cdd850e..54f263d 100644
--- a/debian/jspwiki.links
+++ b/debian/jspwiki.links
@@ -21,5 +21,5 @@ usr/share/java/oscache.jar usr/share/jspwiki/WEB-INF/lib/oscache.jar
 usr/share/java/lucene-core.jar usr/share/jspwiki/WEB-INF/lib/lucene-core.jar
 usr/share/java/lucene-highlighter.jar usr/share/jspwiki/WEB-INF/lib/lucene-highlighter.jar
 usr/share/java/jabsorb.jar usr/share/jspwiki/WEB-INF/lib/jabsorb.jar
-usr/share/java/jstl1.1.jar usr/share/jspwiki/WEB-INF/lib/jstl.jar
-usr/share/java/standard.jar usr/share/jspwiki/WEB-INF/lib/standard.jar
+usr/share/java/taglibs-standard-spec.jar usr/share/jspwiki/WEB-INF/lib/taglibs-standard-spec.jar
+usr/share/java/taglibs-standard-impl.jar usr/share/jspwiki/WEB-INF/lib/taglibs-standard-impl.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jspwiki.git