Author: drazzib Date: 2010-01-17 14:02:58 +0000 (Sun, 17 Jan 2010) New Revision: 11358
Modified: trunk/yuicompressor/debian/changelog trunk/yuicompressor/debian/patches/decompiler.patch trunk/yuicompressor/debian/patches/parser.patch trunk/yuicompressor/debian/patches/token.patch trunk/yuicompressor/debian/patches/tokenstream.patch trunk/yuicompressor/debian/patches/use-system-libraries.patch Log: Merge changes done by Michael Gilbert Modified: trunk/yuicompressor/debian/changelog =================================================================== --- trunk/yuicompressor/debian/changelog 2010-01-17 12:33:44 UTC (rev 11357) +++ trunk/yuicompressor/debian/changelog 2010-01-17 14:02:58 UTC (rev 11358) @@ -1,16 +1,8 @@ -yui-compressor (2.4.2-1) UNRELEASED; urgency=low +yui-compressor (2.4.2-1) unstable; urgency=low [ Dominik Smatana ] * Initial release (closes: #519938) - [ Damien Raude-Morvan ] - * TODO FIX CONFLICT WITH RHINO 1.7R2: - - http://yuilibrary.com/projects/yuicompressor/ticket/1859529 - [ Allow Compressor to work with js.jar ] - - http://yuilibrary.com/projects/yuicompressor/ticket/2527981 - [ Release jar needs a rule set to minimize classpath conflicts - when used in a build environment that has Rhino ] - [ Michael Gilbert ] * Download the required rhino source files in the orig tarball fetching script. @@ -20,4 +12,4 @@ * Add a launcher shell script. * Add a manpage for the shell script. - -- Damien Raude-Morvan <draz...@debian.org> Mon, 09 Nov 2009 23:36:47 +0100 + -- Michael Gilbert <michael.s.gilb...@gmail.com> Thu, 07 Jan 2010 21:34:14 -0500 Modified: trunk/yuicompressor/debian/patches/decompiler.patch =================================================================== --- trunk/yuicompressor/debian/patches/decompiler.patch 2010-01-17 12:33:44 UTC (rev 11357) +++ trunk/yuicompressor/debian/patches/decompiler.patch 2010-01-17 14:02:58 UTC (rev 11358) @@ -1,3 +1,5 @@ +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 @@ Modified: trunk/yuicompressor/debian/patches/parser.patch =================================================================== --- trunk/yuicompressor/debian/patches/parser.patch 2010-01-17 12:33:44 UTC (rev 11357) +++ trunk/yuicompressor/debian/patches/parser.patch 2010-01-17 14:02:58 UTC (rev 11358) @@ -1,3 +1,5 @@ +YUI patch for the Rhino library's Parser.java +=================================================================== --- a/src/org/mozilla/javascript/Parser.java 2008-11-14 10:13:36.000000000 -0500 +++ b/src/org/mozilla/javascript/Parser.java 2008-11-14 10:13:36.000000000 -0500 @@ -163,11 +163,30 @@ Modified: trunk/yuicompressor/debian/patches/token.patch =================================================================== --- trunk/yuicompressor/debian/patches/token.patch 2010-01-17 12:33:44 UTC (rev 11357) +++ trunk/yuicompressor/debian/patches/token.patch 2010-01-17 14:02:58 UTC (rev 11358) @@ -1,3 +1,5 @@ +YUI patch for the Rhino library's Token.java +=================================================================== --- a/src/org/mozilla/javascript/Token.java.orig 2009-12-25 00:39:07.000000000 -0500 +++ b/src/org/mozilla/javascript/Token.java 2009-12-25 00:39:39.000000000 -0500 @@ -258,7 +258,11 @@ Modified: trunk/yuicompressor/debian/patches/tokenstream.patch =================================================================== --- trunk/yuicompressor/debian/patches/tokenstream.patch 2010-01-17 12:33:44 UTC (rev 11357) +++ trunk/yuicompressor/debian/patches/tokenstream.patch 2010-01-17 14:02:58 UTC (rev 11358) @@ -1,3 +1,5 @@ +YUI patch for the Rhino library's TokenStream.java +=================================================================== --- a/src/org/mozilla/javascript/TokenStream.java.orig 2009-12-25 00:40:57.000000000 -0500 +++ b/src/org/mozilla/javascript/TokenStream.java 2009-12-25 00:41:26.000000000 -0500 @@ -526,7 +526,7 @@ Modified: trunk/yuicompressor/debian/patches/use-system-libraries.patch =================================================================== --- trunk/yuicompressor/debian/patches/use-system-libraries.patch 2010-01-17 12:33:44 UTC (rev 11357) +++ trunk/yuicompressor/debian/patches/use-system-libraries.patch 2010-01-17 14:02:58 UTC (rev 11358) @@ -1,3 +1,5 @@ +Use Debian's jargs ard rhino libraries +=================================================================== --- a/build.xml 2009-12-25 14:46:22.000000000 -0500 +++ b/build.xml 2009-12-25 15:59:59.000000000 -0500 @@ -20,10 +20,10 @@ _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
