![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f023d09)
raw | patch | inline | side by side (parent: f023d09)
| author | Sebastian Harl <sh@tokkee.org> | |
| Wed, 28 Jul 2010 16:32:14 +0000 (18:32 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Wed, 28 Jul 2010 16:32:14 +0000 (18:32 +0200) |
| debian/changelog | patch | blob | history | |
| debian/patches/00list | patch | blob | history | |
| debian/patches/bts561577_collectd2html_recursive_fix.dpatch | [deleted file] | patch | blob | history |
| debian/patches/bts575029-collectd2html-xhtml.dpatch | [deleted file] | patch | blob | history |
diff --git a/debian/changelog b/debian/changelog
index 48b092a187add0b11b057aa2cd1cc17b4e42cc01..9139412e1187f578221fb810c4cdc711ccc427d7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
collectd (4.10.1-1) unstable; urgency=low
* New upstream release.
+ * debian/patches:
+ - Removed bts561577_collectd2html_recursive_fix -- applied upstream.
+ - Removed bts575029-collectd2html-xhtml -- applied upstream.
- -- Sebastian Harl <tokkee@debian.org> Wed, 28 Jul 2010 18:26:10 +0200
+ -- Sebastian Harl <tokkee@debian.org> Wed, 28 Jul 2010 18:31:35 +0200
collectd (4.10.0-1) unstable; urgency=low
diff --git a/debian/patches/00list b/debian/patches/00list
index 2ba95f8b3da8b57881638e77f7696bb87ccfb11e..61d55b6b4dbbe740a180432223a5901ddd56adab 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
rrd_filter_path.dpatch
collection_conf_path.dpatch
-bts561577_collectd2html_recursive_fix.dpatch
bts557599_powerdns_fix.dpatch
bts559801_plugin_find_fix.dpatch
-bts575029-collectd2html-xhtml.dpatch
diff --git a/debian/patches/bts561577_collectd2html_recursive_fix.dpatch b/debian/patches/bts561577_collectd2html_recursive_fix.dpatch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts561577_collectd2html_recursive_fix.dpatch
-## by Yuri D'Elia <wavexx@thregr.org>
-##
-## DP: collectd2html: Fixed recursive mode.
-## DP:
-## DP: Also, improved default settings to match the collectd4 series.
-
-@DPATCH@
-
-diff a/contrib/collectd2html.pl b/contrib/collectd2html.pl
---- a/contrib/collectd2html.pl
-+++ b/contrib/collectd2html.pl
-@@ -44,7 +44,7 @@
- my $DIR = "/var/lib/collectd";
- my $HOST = undef;
- my $IMG_FMT = "PNG";
--my $RECURSIVE = 0;
-+my $RECURSIVE = 1;
-
- GetOptions (
- "host=s" => \$HOST,
-@@ -63,7 +63,7 @@
-
- my @COLORS = (0xff7777, 0x7777ff, 0x55ff55, 0xffcc77, 0xff77ff, 0x77ffff,
- 0xffff77, 0x55aaff);
--my @tmp = `/bin/hostname`; chomp(@tmp);
-+my @tmp = `/bin/hostname -f`; chomp(@tmp);
- $HOST = $tmp[0] if (! defined $HOST);
- my $svg_p = ($IMG_FMT eq "SVG");
- my $IMG_SFX = $svg_p ? ".svg" : ".png";
-@@ -140,7 +140,8 @@
- }
- chomp(@list);
-
--foreach my $rrd (sort @list){
-+@list = sort @list;
-+foreach my $rrd (@list){
- $rrd =~ m/^$DIR\/(.*)\.rrd$/;
- push(@rrds, $1);
- }
diff --git a/debian/patches/bts575029-collectd2html-xhtml.dpatch b/debian/patches/bts575029-collectd2html-xhtml.dpatch
+++ /dev/null
@@ -1,114 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts575029-collectd2html-xhtml.dpatch by Max Henkel <henkel@gmx.at> and
-## Timur Kirilichev <dontstay@pochta.ru>
-##
-## DP: collectd2html.pl: Added support for XHTML.
-
-@DPATCH@
-
-diff a/contrib/collectd2html.pl b/contrib/collectd2html.pl
---- a/contrib/collectd2html.pl
-+++ b/contrib/collectd2html.pl
-@@ -68,7 +68,7 @@ $HOST = $tmp[0] if (! defined $HOST);
- my $svg_p = ($IMG_FMT eq "SVG");
- my $IMG_SFX = $svg_p ? ".svg" : ".png";
- my $IMG_DIR = "${HOST}.dir";
--my $HTML = "${HOST}.html";
-+my $HTML = "${HOST}.xhtml";
-
- ################################################################################
- #
-@@ -118,14 +118,20 @@ open(OUT, ">$HTML");
- my $title="Rrd plot for $HOST";
-
- print OUT <<END;
--<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-- "http://www.w3.org/TR/html4/loose.dtd">
--<html>
-+<!DOCTYPE html PUBLIC
-+ "-//W3C//DTD XHTML 1.1//EN"
-+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-+<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-+<style type="text/css" media="screen">
-+.graph { text-align: center; }
-+object.graph { width: 670; height: 179; }
-+</style>
- <title>$title</title>
-+<meta http-equiv="Content-Type"
-+ content="application/xhtml+xml; charset=us-ascii" />
- </head>
- <body>
--<center>
- END
-
- # list interesting rrd
-@@ -148,20 +154,20 @@ foreach my $rrd (@list){
-
- # table of contents
- print OUT <<END;
--<A name="top"></A><H1>$title</H1>
--<P>
-+<h1><a id="top">$title</a></h1>
-+<p>
- END
-
- foreach my $bn (@rrds){
- my $cleaned_bn = $bn;
- $cleaned_bn =~ tr/%\//__/;
- print OUT <<END;
--<A href="#$cleaned_bn">$bn</A>
-+<a href="#$cleaned_bn">$bn</a>
- END
- }
-
- print OUT <<END;
--</P>
-+</p>
- END
-
- # graph interesting rrd
-@@ -206,7 +212,7 @@ for (my $i = 0; $i < scalar(@rrds); ++$i) {
- my $cleaned_bn = $bn;
- $cleaned_bn =~ tr/%\//__/;
- print OUT <<END;
--<A name="$cleaned_bn"></A><H1>$bn</H1>
-+<h2><a id="$cleaned_bn">$bn</a></h2>
- END
-
- # graph various ranges
-@@ -223,24 +229,28 @@ END
- my $cleaned_img = $img; $cleaned_img =~ s/%/%25/g;
- if (! $svg_p) {
- print OUT <<END;
--<P><IMG src="$cleaned_img" alt="${bn} $span"></P>
-+<p class="graph"><img src="$cleaned_img" alt="${bn} $span" /></p>
- END
- } else {
- print OUT <<END;
--<P><object data="$cleaned_img" type="image/svg+xml"
-- width="670" height="179">
-- ${bn} $span</object></P>
-+<p class="graph"><object data="$cleaned_img" type="image/svg+xml">
-+ ${bn} $span</object></p>
- END
- }
- }
-
- print OUT <<END;
--<A href="#top">[top]</A>
-+<p><a href="#top">[top]</a></p>
- END
- }
-
- print OUT <<END;
--</center>
-+<hr />
-+<p>
-+ <a href="http://validator.w3.org/check?uri=referer"><img
-+ src="http://www.w3.org/Icons/valid-xhtml10"
-+ alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
-+</p>
- </body>
- </html>
- END