[jspwiki] 21/24: Use the Debian packages providing ecs, commons-logging and nekohtml

[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 eaf7349fb96e63cb06e145c1f4e13365add42874
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 7 12:25:50 2014 +0000

    Use the Debian packages providing ecs, commons-logging and nekohtml
---
 debian/changelog     | 2 ++
 debian/control       | 3 +++
 debian/jspwiki.links | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 090a075..2152966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ jspwiki (2.8.0-6) UNRELEASED; urgency=medium
   * 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
+  * Use the Debian packages providing ecs, commons-logging and nekohtml instead
+    of the prebuilt jars in the source package
   * Don't mark the symlink /etc/tomcat6/policy.d/05jspwiki.policy as a conffile
   * Compress the JavaScript files with the YUI compressor packaged in Debian
   * Switch to the source format 3.0 (quilt)
diff --git a/debian/control b/debian/control
index cf2b1b6..6bc27b2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,12 +9,14 @@ Build-Depends-Indep: libcommons-codec-java,
                      libcommons-httpclient-java,
                      libcommons-io-java,
                      libcommons-lang-java,
+                     libjakarta-ecs-java,
                      libjakarta-taglibs-standard-java,
                      libjaxen-java,
                      libjdom1-java,
                      libjstl1.1-java,
                      liblog4j1.2-java,
                      liblucene2-java,
+                     libnekohtml-java,
                      liboro-java,
                      liboscache-java,
                      tomcat6,
@@ -35,6 +37,7 @@ Depends: libcommons-codec-java,
          libcommons-lang-java,
          libcommons-logging-java,
          libjabsorb-java,
+         libjakarta-ecs-java,
          libjakarta-taglibs-standard-java,
          libjaxen-java,
          libjdom1-java,
diff --git a/debian/jspwiki.links b/debian/jspwiki.links
index 5e46ea7..30b1c12 100644
--- a/debian/jspwiki.links
+++ b/debian/jspwiki.links
@@ -9,9 +9,12 @@ usr/share/java/commons-fileupload.jar usr/share/jspwiki/WEB-INF/lib/commons-file
 usr/share/java/commons-httpclient.jar usr/share/jspwiki/WEB-INF/lib/commons-httpclient.jar
 usr/share/java/commons-io.jar usr/share/jspwiki/WEB-INF/lib/commons-io.jar
 usr/share/java/commons-lang.jar usr/share/jspwiki/WEB-INF/lib/commons-lang.jar
+usr/share/java/commons-logging-api.jar usr/share/jspwiki/WEB-INF/lib/commons-logging-api.jar
+usr/share/java/ecs.jar usr/share/jspwiki/WEB-INF/lib/ecs.jar
 usr/share/java/jdom1.jar usr/share/jspwiki/WEB-INF/lib/jdom1.jar
 usr/share/java/jaxen.jar usr/share/jspwiki/WEB-INF/lib/jaxen.jar
 usr/share/java/jaxp-1.3.jar usr/share/jspwiki/WEB-INF/lib/jaxp-1.3.jar
+usr/share/java/nekohtml.jar usr/share/jspwiki/WEB-INF/lib/nekohtml.jar
 usr/share/java/oro.jar usr/share/jspwiki/WEB-INF/lib/oro.jar
 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

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