severity 547700 serious reassign 547735 bootchart-view forcemerge 547700 547708 547735 tags 547700 + patch thanks
I tested the patch I found in <URL:http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=24;filename=update_commons_api.dpatch;att=1;bug=547735>, and used it to replace the content of debian/patches/replace-tar.dpatch. This made the source build and I believe it will fix this problem. Jörg, please let me know if you do not want an NMU to fix this issue. diff -ur ../bootchart-0.10~svn407/debian/patches/replace-tar.dpatch ../bootchart-0.10~svn407-pere/debian/patches/replace-tar.dpatch --- ../bootchart-0.10~svn407/debian/patches/replace-tar.dpatch 2009-10-04 21:10:21.000000000 +0200 +++ ../bootchart-0.10~svn407-pere/debian/patches/replace-tar.dpatch 2009-10-04 21:26:48.000000000 +0200 @@ -1,21 +1,48 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## replace-tar.dpatch by Jörg Sommer <jo...@alea.gnuu.de> +## update_commons_api.dpatch by <kbyte...@gmail.com> ## -## DP: The path to the classes for tar changed somewhen from o.a.c.c.tar to -## DP: o.a.c.c.archivers.tar. +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. @DPATCH@ -diff -urNad bootchart-upstream~/src/org/bootchart/Main.java bootchart-upstream/src/org/bootchart/Main.java ---- bootchart-upstream~/src/org/bootchart/Main.java 2007-12-22 20:50:53.000000000 +0100 -+++ bootchart-upstream/src/org/bootchart/Main.java 2007-12-22 21:00:32.831683916 +0100 +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.tar.TarEntry; -+import org.apache.commons.compress.archivers.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) { -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
