#! /bin/sh /usr/share/dpatch/dpatch-run ## update_commons_api.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad bootchart-0.10~svn407~/src/org/bootchart/Main.java bootchart-0.10~svn407/src/org/bootchart/Main.java --- bootchart-0.10~svn407~/src/org/bootchart/Main.java 2007-12-23 01:08:52.000000000 +0100 +++ bootchart-0.10~svn407/src/org/bootchart/Main.java 2009-10-03 14:05:54.000000000 +0200 @@ -41,8 +41,8 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.compress.tar.TarEntry; -import org.apache.commons.compress.tar.TarInputStream; +import org.apache.commons.compress.archivers.ArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.bootchart.common.BootStats; import org.bootchart.common.Common; import org.bootchart.common.ProcessTree; @@ -177,7 +177,7 @@ if (!logFile.exists()) { return null; } - TarInputStream tis = null; + TarArchiveInputStream tis = null; File[] files = null; boolean isLogTarball; // whether it's a tarball or dir if (logFile.isFile()) { @@ -186,7 +186,7 @@ if (logFile.getName().endsWith("gz")) { is = new GZIPInputStream(is); } - tis = new TarInputStream(is); + tis = new TarArchiveInputStream(is); } else { isLogTarball = false; files = logFile.listFiles(); @@ -210,7 +210,7 @@ while (hasMoreFiles) { String logName = null; InputStream is = null; - TarEntry tarEntry = null; + ArchiveEntry tarEntry = null; if (isLogTarball) { tarEntry = tis.getNextEntry(); if (tarEntry == null) {