This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jspwiki.
commit d167797b6594079eeb301336146ddc9533a783b9 Author: Emmanuel Bourg <[email protected]> Date: Thu Mar 6 16:30:36 2014 +0000 Compress the JavaScript files with the YUI compressor packaged in Debian --- debian/changelog | 1 + debian/control | 1 + debian/patches/04_use_debian_yuicompressor.patch | 11 +++++++++++ debian/patches/series | 1 + 4 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0727a7a..090a075 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ jspwiki (2.8.0-6) UNRELEASED; urgency=medium 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: diff --git a/debian/control b/debian/control index 08fb079..cf2b1b6 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Build-Depends-Indep: libcommons-codec-java, liboscache-java, tomcat6, unzip, + yui-compressor, wget Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jspwiki diff --git a/debian/patches/04_use_debian_yuicompressor.patch b/debian/patches/04_use_debian_yuicompressor.patch new file mode 100644 index 0000000..ec54a4a --- /dev/null +++ b/debian/patches/04_use_debian_yuicompressor.patch @@ -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}" /> diff --git a/debian/patches/series b/debian/patches/series index 8fe3106..64b43bd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01_jabsorb_api.dpatch 02_ignore_binary_jars.dpatch 03_weblog-plugin_tweaks.patch +04_use_debian_yuicompressor.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jspwiki.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
