From a71fa2232252c44161ba0d70474f0b0cf5c6c677 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Wed, 28 Jul 2010 18:32:14 +0200 Subject: [PATCH] patches: Removed collectd2html related patches -- applied upstream. --- debian/changelog | 5 +- debian/patches/00list | 2 - ...s561577_collectd2html_recursive_fix.dpatch | 41 ------- .../bts575029-collectd2html-xhtml.dpatch | 114 ------------------ 4 files changed, 4 insertions(+), 158 deletions(-) delete mode 100755 debian/patches/bts561577_collectd2html_recursive_fix.dpatch delete mode 100755 debian/patches/bts575029-collectd2html-xhtml.dpatch diff --git a/debian/changelog b/debian/changelog index 48b092a..9139412 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ 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 Wed, 28 Jul 2010 18:26:10 +0200 + -- Sebastian Harl 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 2ba95f8..61d55b6 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,7 +1,5 @@ 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 deleted file mode 100755 index ea8c7d3..0000000 --- a/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 -## -## 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 deleted file mode 100755 index 5481b88..0000000 --- a/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 and -## Timur Kirilichev -## -## 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 < -- -+ -+ - -+ - $title -+ - - -- - END - - # list interesting rrd -@@ -148,20 +154,20 @@ foreach my $rrd (@list){ - - # table of contents - print OUT <

$title

- END - - foreach my $bn (@rrds){ - my $cleaned_bn = $bn; - $cleaned_bn =~ tr/%\//__/; - print OUT <$bn -+$bn - END - } - - print OUT < -+

- 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 <

$bn

- END - - # graph various ranges -@@ -223,24 +229,28 @@ END - my $cleaned_img = $img; $cleaned_img =~ s/%/%25/g; - if (! $svg_p) { - print OUT < ${bn} $span

${bn} $span

- END - } else { - print OUT <

- END - } - } - - print OUT <[top] -+

[top]

- END - } - - print OUT < -+

-+ -+

- - - END -- 2.30.2