[pkg-java] r17847 - in trunk/jspwiki/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-06 16:30:36 +0000 (Thu, 06 Mar 2014)
New Revision: 17847

Added:
   trunk/jspwiki/debian/patches/04_use_debian_yuicompressor.patch
Modified:
   trunk/jspwiki/debian/changelog
   trunk/jspwiki/debian/control
   trunk/jspwiki/debian/patches/series
Log:
Compress the JavaScript files with the YUI compressor packaged in Debian



Modified: trunk/jspwiki/debian/changelog
===================================================================
--- trunk/jspwiki/debian/changelog	2014-03-06 15:59:18 UTC (rev 17846)
+++ trunk/jspwiki/debian/changelog	2014-03-06 16:30:36 UTC (rev 17847)
@@ -5,6 +5,7 @@
     on libgnujaf-java
   * Fixed the broken links to jstl.jar and standard.jar
   * 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)
   * Switch to debhelper level 9
   * debian/control:

Modified: trunk/jspwiki/debian/control
===================================================================
--- trunk/jspwiki/debian/control	2014-03-06 15:59:18 UTC (rev 17846)
+++ trunk/jspwiki/debian/control	2014-03-06 16:30:36 UTC (rev 17847)
@@ -19,6 +19,7 @@
                      liboscache-java,
                      tomcat6,
                      unzip,
+                     yui-compressor,
                      wget
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jspwiki

Added: trunk/jspwiki/debian/patches/04_use_debian_yuicompressor.patch
===================================================================
--- trunk/jspwiki/debian/patches/04_use_debian_yuicompressor.patch	                        (rev 0)
+++ trunk/jspwiki/debian/patches/04_use_debian_yuicompressor.patch	2014-03-06 16:30:36 UTC (rev 17847)
@@ -0,0 +1,11 @@
+--- a/build.xml
++++ b/build.xml
+@@ -421,7 +421,7 @@
+         <attribute name="src"/>
+         <attribute name="args" default=""/>   
+         <sequential>
+-            <java jar="tests/lib/yuicompressor-2.3.3.jar"
++            <java jar="/usr/share/yui-compressor/yui-compressor.jar"
+                   output="${tmpdir}/compress/@{src}"
+                   fork="true">
+                 <arg line="'${code.src}/@{src}' @{args}" />

Modified: trunk/jspwiki/debian/patches/series
===================================================================
--- trunk/jspwiki/debian/patches/series	2014-03-06 15:59:18 UTC (rev 17846)
+++ trunk/jspwiki/debian/patches/series	2014-03-06 16:30:36 UTC (rev 17847)
@@ -1,3 +1,4 @@
 01_jabsorb_api.dpatch
 02_ignore_binary_jars.dpatch
 03_weblog-plugin_tweaks.patch
+04_use_debian_yuicompressor.patch