Package: bootchart
Version: 0.10~svn407-3.3
Severity: wishlist
Tags: patch
This is the patch I used in my NMU.
diff -ur bootchart-0.10~svn407/debian/changelog
bootchart-0.10~svn407-pere/debian/changelog
--- bootchart-0.10~svn407/debian/changelog 2009-10-05 22:00:33.000000000
+0200
+++ bootchart-0.10~svn407-pere/debian/changelog 2009-10-05 22:15:11.000000000
+0200
@@ -1,3 +1,12 @@
+bootchart (0.10~svn407-3.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Updated patch replace-tar.dpatch to change java converter
+ to use new TarArchiveInputStream API and not TarInputStream
+ (Closes: #547700). Patch from Andrea Briganti.
+
+ -- Petter Reinholdtsen <p...@debian.org> Mon, 05 Oct 2009 22:07:01 +0200
+
bootchart (0.10~svn407-3.2) unstable; urgency=low
* Non-maintainer upload to fix release goal.
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-05
22:00:33.000000000 +0200
+++ bootchart-0.10~svn407-pere/debian/patches/replace-tar.dpatch
2009-10-05 22:14:30.000000000 +0200
@@ -1,21 +1,49 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## replace-tar.dpatch by Jörg Sommer <jo...@alea.gnuu.de>
+## replace-tar.dpatch by Andrea Briganti
##
-## 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: Change java converter to use new TarArchiveInputStream API and
+## DP: not TarInputStream (Closes: #547700).
@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) {
Happy hacking,
--
Petter Reinholdtsen
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
