[jspwiki] 12/24: Fixed the broken links to jstl.jar and standard.jar

[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 1f3c4aaadf9187fc2e6b90766845c65b750a714d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 6 14:22:51 2014 +0000

    Fixed the broken links to jstl.jar and standard.jar
---
 debian/changelog     | 1 +
 debian/control       | 4 ++++
 debian/jspwiki.links | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b34b1c..2d06349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jspwiki (2.8.0-6) UNRELEASED; urgency=medium
   * Team upload.
   * Build with the default JDK instead of GCJ and removed the dependency
     on libgnujaf-java
+  * Fixed the broken links to jstl.jar and standard.jar
   * Switch to the source format 3.0 (quilt)
   * Switch to debhelper level 9
   * Standards-Version updated to 3.9.5 (no changes)
diff --git a/debian/control b/debian/control
index 6d6e2cf..57812e2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,10 @@ Build-Depends-Indep: libcommons-codec-java,
                      libcommons-httpclient-java,
                      libcommons-io-java,
                      libcommons-lang-java,
+                     libjakarta-taglibs-standard-java,
                      libjaxen-java,
                      libjdom1-java,
+                     libjstl1.1-java,
                      liblog4j1.2-java,
                      liblucene2-java,
                      liboro-java,
@@ -34,8 +36,10 @@ Depends: libcommons-codec-java,
          libcommons-lang-java,
          libcommons-logging-java,
          libjabsorb-java,
+         libjakarta-taglibs-standard-java,
          libjaxen-java,
          libjdom1-java,
+         libjstl1.1-java,
          liblog4j1.2-java,
          liblucene2-java,
          libnekohtml-java,
diff --git a/debian/jspwiki.links b/debian/jspwiki.links
index 0dc8fdc..5e46ea7 100644
--- a/debian/jspwiki.links
+++ b/debian/jspwiki.links
@@ -17,5 +17,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/tomcat6-webapps/jsp-examples/WEB-INF/lib/jstl.jar usr/share/jspwiki/WEB-INF/lib/jstl.jar
-usr/share/tomcat6-webapps/jsp-examples/WEB-INF/lib/standard.jar usr/share/jspwiki/WEB-INF/lib/standard.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

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