This is an automated email from the git hooks/post-receive script. mgilbert pushed a commit to branch master in repository yui-compressor.
commit 232b3349e1d25f989a83a3897977a7fc91587624 Author: Michael Gilbert <mgilb...@debian.org> Date: Sat Feb 10 22:18:27 2018 +0000 updates to support upstream version 2.4.8 --- debian/changelog | 9 ++++++--- debian/fetch-upstream | 24 ++++++++++++------------ debian/patches/decompiler.patch | 6 +++--- debian/patches/fix_testsuite.diff | 4 ++-- debian/patches/use-system-libraries.patch | 12 ++++++------ debian/rules | 6 ++---- 6 files changed, 31 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ff1c01..334502c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -yui-compressor (2.4.7-4) UNRELEASED; urgency=medium +yui-compressor (2.4.8-1) unstable; urgency=medium - * Team upload. + [ Michael Gilbert ] + * New upstream release (closes: #775750). + + [ tony mancill ] * Moved the package to Git - -- tony mancill <tmanc...@debian.org> Wed, 05 Jul 2017 21:42:38 -0700 + -- Michael Gilbert <mgilb...@debian.org> Mon, 27 Nov 2017 02:59:22 +0000 yui-compressor (2.4.7-3) unstable; urgency=medium diff --git a/debian/fetch-upstream b/debian/fetch-upstream old mode 100644 new mode 100755 index ac033e1..5516a1e --- a/debian/fetch-upstream +++ b/debian/fetch-upstream @@ -1,7 +1,7 @@ #!/bin/sh + set -e -echo $# if test "$#" != "3" ; then echo "usage: $0 <upstream version number> <expected tarball version> <rhino package version>" exit 1 @@ -12,10 +12,11 @@ rhino_version="$3" curdir="$PWD" # download -cd /tmp -wget -N http://yui.zenfs.com/releases/yuicompressor/yuicompressor-$version.zip -unzip -xq yuicompressor-$version.zip -rm yuicompressor-$version.zip +cd $(mktemp -d) +echo Working in: $(pwd) +wget -N https://github.com/yui/yuicompressor/archive/v$version.zip +unzip -xq v$version.zip +rm v$version.zip # cleanup rm -rf yuicompressor-$version/build @@ -24,15 +25,14 @@ rm -rf yuicompressor-$version/src/org/mozilla/javascript/* # download rhino source debsnap --verbose rhino $rhino_version -rhino_tar_version="$(echo $rhino_version | cut -d - -f 1)" -rhino_dir_version="$(echo $rhino_tar_version | sed "s/\./_/")" -(cd source-rhino/; tar xvzf rhino_$rhino_tar_version.orig.tar.gz) -cp -r source-rhino/rhino$rhino_dir_version/src/org/mozilla/* yuicompressor-$version/src/org/mozilla/ +(cd source-rhino/; tar xf rhino*.tar.gz) +rm source-rhino/*.gz source-rhino/*.dsc +cp -r source-rhino/*/src/org/mozilla/* yuicompressor-$version/src/org/mozilla/ # repack mv yuicompressor-$version yui-compressor-$version -tar czf yui-compressor_$orig_tarball_version.orig.tar.gz yui-compressor-$version +tar cJf yui-compressor_$orig_tarball_version.orig.tar.xz yui-compressor-$version rm -rf yui-compressor-$version rm -rf source-rhino -mv yui-compressor_$orig_tarball_version.orig.tar.gz $curdir -echo "Done: successfully created yui-compressor_$version.orig.tar.gz." +mv yui-compressor_$orig_tarball_version.orig.tar.xz $curdir +echo "Done: successfully created yui-compressor_$version.orig.tar.xz." diff --git a/debian/patches/decompiler.patch b/debian/patches/decompiler.patch index 858e7c0..149477e 100644 --- a/debian/patches/decompiler.patch +++ b/debian/patches/decompiler.patch @@ -1,8 +1,8 @@ YUI patch for the Rhino library's Decompiler.java =================================================================== ---- a/src/org/mozilla/javascript/Decompiler.java.orig 2008-11-14 10:13:36.000000000 -0500 -+++ b/src/org/mozilla/javascript/Decompiler.java 2008-11-14 10:13:36.000000000 -0500 -@@ -166,6 +166,18 @@ +--- a/src/org/mozilla/javascript/Decompiler.java ++++ b/src/org/mozilla/javascript/Decompiler.java +@@ -133,6 +133,18 @@ public class Decompiler appendString('/' + regexp + '/' + flags); } diff --git a/debian/patches/fix_testsuite.diff b/debian/patches/fix_testsuite.diff index d5eeca0..c7da736 100644 --- a/debian/patches/fix_testsuite.diff +++ b/debian/patches/fix_testsuite.diff @@ -4,11 +4,11 @@ Last-Update: 2011-06-12 Forwarded: not-needed --- a/tests/suite.sh +++ b/tests/suite.sh -@@ -18,7 +18,7 @@ +@@ -18,7 +18,7 @@ runtest () { if [ "$2" == "cssminjs" ]; then actual="$( -- java -jar ../lib/rhino-1.6R7.jar suite.rhino $testfile +- java -jar ../lib/rhino-1.7R2.jar suite.rhino $testfile + java -jar /usr/share/java/js.jar suite.rhino $testfile )" diff --git a/debian/patches/use-system-libraries.patch b/debian/patches/use-system-libraries.patch index 0934517..9f915b3 100644 --- a/debian/patches/use-system-libraries.patch +++ b/debian/patches/use-system-libraries.patch @@ -6,28 +6,28 @@ Author: Damien Raude-Morvan <draz...@debian.org> Last-Update: 2010-01-17 --- a/build.xml +++ b/build.xml -@@ -23,8 +23,7 @@ - target="1.5" +@@ -36,8 +36,7 @@ + target="1.5" source="1.5"> <classpath> - <pathelement location="${lib.dir}/jargs-1.0.jar"/> -- <pathelement location="${lib.dir}/rhino-1.6R7.jar"/> +- <pathelement location="${lib.dir}/rhino-1.7R2.jar"/> + <pathelement location="/usr/share/java/jargs.jar"/> </classpath> </javac> </target> -@@ -33,13 +32,12 @@ +@@ -46,13 +45,12 @@ <mkdir dir="${build.dir}/jar"/> <!-- The order is important here. Rhino MUST be unjarred first! (some of our own classes will override the Rhino classes) --> - <unjar src="${lib.dir}/jargs-1.0.jar" dest="${build.dir}/jar"/> -- <unjar src="${lib.dir}/rhino-1.6R7.jar" dest="${build.dir}/jar"/> +- <unjar src="${lib.dir}/rhino-1.7R2.jar" dest="${build.dir}/jar"/> <copy todir="${build.dir}/jar"> <fileset dir="${build.dir}/classes" includes="**/*.class"/> </copy> <jar destfile="${build.dir}/${jar.name}" basedir="${build.dir}/jar"> <manifest> -+ <attribute name="Class-Path" value="/usr/share/java/jargs.jar"/> ++ <attribute name="Class-Path" value="/usr/share/java/jargs.jar"/> <attribute name="Main-Class" value="com.yahoo.platform.yui.compressor.Bootstrap"/> </manifest> </jar> diff --git a/debian/rules b/debian/rules index fd12e49..91a8496 100755 --- a/debian/rules +++ b/debian/rules @@ -3,16 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -DEB_COMPRESS_EXCLUDE := .class -JAVA_HOME := /usr/lib/jvm/default-java +JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := jargs DEB_ANT_BUILD_TARGET := build.jar DEB_CLEAN_BUILD_TARGET := clean -DEB_DH_INSTALLCHANGELOGS_ARGS := doc/CHANGELOG LIBRARY=yui-compressor -VERSION=2.4.7 +VERSION=2.4.8 RHINO_VERSION=1.7R2-4 install/yui-compressor:: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/yui-compressor.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits