[closure-compiler] 01/04: Backported a change replacing the deprecated LimitInputStream class in Guava with ByteStreams.limit()

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository closure-compiler.

commit 524f842cce404ffc39bf6479466101a107a6db61
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 12 12:52:58 2013 +0200

    Backported a change replacing the deprecated LimitInputStream class in Guava with ByteStreams.limit()
---
 debian/changelog                         |    8 ++++++++
 debian/patches/guava-compatibility.patch |   25 +++++++++++++++++++++++++
 debian/patches/series                    |    1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 204d70a..9bf5057 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+closure-compiler (20130227+dfsg1-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Backported a change replacing the deprecated LimitInputStream class
+    in Guava with ByteStreams.limit()
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 12 Sep 2013 12:46:47 +0200
+
 closure-compiler (20130227+dfsg1-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/guava-compatibility.patch b/debian/patches/guava-compatibility.patch
new file mode 100644
index 0000000..db33645
--- /dev/null
+++ b/debian/patches/guava-compatibility.patch
@@ -0,0 +1,25 @@
+Description: Replaced the deprecated class LimitInputStream removed in Guava 15.0
+ with ByteStreams.limit() introduced in Guava 14.0. This was fixed upstream
+ in the v20130411 release.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/com/google/javascript/jscomp/CommandLineRunner.java
++++ b/src/com/google/javascript/jscomp/CommandLineRunner.java
+@@ -22,7 +22,7 @@
+ import com.google.common.collect.Maps;
+ import com.google.common.collect.Sets;
+ import com.google.common.io.Files;
+-import com.google.common.io.LimitInputStream;
++import com.google.common.io.ByteStreams;
+ 
+ import org.kohsuke.args4j.Argument;
+ import org.kohsuke.args4j.CmdLineException;
+@@ -931,7 +931,7 @@
+     Map<String, SourceFile> externsMap = Maps.newHashMap();
+     for (ZipEntry entry = null; (entry = zip.getNextEntry()) != null; ) {
+       BufferedInputStream entryStream = new BufferedInputStream(
+-          new LimitInputStream(zip, entry.getSize()));
++          ByteStreams.limit(zip, entry.getSize()));
+       externsMap.put(entry.getName(),
+           SourceFile.fromInputStream(
+               // Give the files an odd prefix, so that they do not conflict
diff --git a/debian/patches/series b/debian/patches/series
index 39b9de6..7046a49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 build_xml.patch
 remove_tests_depending_on_caja.patch
+guava-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/closure-compiler.git