[pkg-java] r17849 - trunk/jspwiki/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-07 12:25:50 +0000 (Fri, 07 Mar 2014)
New Revision: 17849

Modified:
   trunk/jspwiki/debian/changelog
   trunk/jspwiki/debian/control
   trunk/jspwiki/debian/jspwiki.links
Log:
Use the Debian packages providing ecs, commons-logging and nekohtml



Modified: trunk/jspwiki/debian/changelog
===================================================================
--- trunk/jspwiki/debian/changelog	2014-03-07 06:24:09 UTC (rev 17848)
+++ trunk/jspwiki/debian/changelog	2014-03-07 12:25:50 UTC (rev 17849)
@@ -4,6 +4,8 @@
   * 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)

Modified: trunk/jspwiki/debian/control
===================================================================
--- trunk/jspwiki/debian/control	2014-03-07 06:24:09 UTC (rev 17848)
+++ trunk/jspwiki/debian/control	2014-03-07 12:25:50 UTC (rev 17849)
@@ -9,12 +9,14 @@
                      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 @@
          libcommons-lang-java,
          libcommons-logging-java,
          libjabsorb-java,
+         libjakarta-ecs-java,
          libjakarta-taglibs-standard-java,
          libjaxen-java,
          libjdom1-java,

Modified: trunk/jspwiki/debian/jspwiki.links
===================================================================
--- trunk/jspwiki/debian/jspwiki.links	2014-03-07 06:24:09 UTC (rev 17848)
+++ trunk/jspwiki/debian/jspwiki.links	2014-03-07 12:25:50 UTC (rev 17849)
@@ -9,9 +9,12 @@
 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