r61192 - in /trunk/libsys-statistics-linux-perl/debian: changelog control copyright patches/ patches/df-in-chroot.patch patches/series patches/spelling.patch rules source/ source/format
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Thu Aug 5 06:14:42 UTC 2010
Author: ansgar-guest
Date: Thu Aug 5 06:14:25 2010
New Revision: 61192
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61192
Log:
* Tests involving df no longer fail in chroot environments.
(Closes: #591123)
+ new patch: df-in-chroot.patch
* Fix spelling errors in the documentation.
+ new patch: spelling.patch
* Use Build.PL.
* Use source format 3.0 (quilt).
* debian/copyright: Formatting changes for current DEP-5 proposal;
refer to /usr/share/common-licenses/GPL-1.
* Bump Standards-Version to 3.9.1.
* Add myself to Uploaders.
Added:
trunk/libsys-statistics-linux-perl/debian/patches/
trunk/libsys-statistics-linux-perl/debian/patches/df-in-chroot.patch
trunk/libsys-statistics-linux-perl/debian/patches/series
trunk/libsys-statistics-linux-perl/debian/patches/spelling.patch
trunk/libsys-statistics-linux-perl/debian/source/
trunk/libsys-statistics-linux-perl/debian/source/format
Modified:
trunk/libsys-statistics-linux-perl/debian/changelog
trunk/libsys-statistics-linux-perl/debian/control
trunk/libsys-statistics-linux-perl/debian/copyright
trunk/libsys-statistics-linux-perl/debian/rules
Modified: trunk/libsys-statistics-linux-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/changelog?rev=61192&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/changelog (original)
+++ trunk/libsys-statistics-linux-perl/debian/changelog Thu Aug 5 06:14:25 2010
@@ -1,3 +1,19 @@
+libsys-statistics-linux-perl (0.56-2) unstable; urgency=low
+
+ * Tests involving df no longer fail in chroot environments.
+ (Closes: #591123)
+ + new patch: df-in-chroot.patch
+ * Fix spelling errors in the documentation.
+ + new patch: spelling.patch
+ * Use Build.PL.
+ * Use source format 3.0 (quilt).
+ * debian/copyright: Formatting changes for current DEP-5 proposal;
+ refer to /usr/share/common-licenses/GPL-1.
+ * Bump Standards-Version to 3.9.1.
+ * Add myself to Uploaders.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Thu, 05 Aug 2010 15:13:30 +0900
+
libsys-statistics-linux-perl (0.56-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libsys-statistics-linux-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/control?rev=61192&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/control (original)
+++ trunk/libsys-statistics-linux-perl/debian/control Thu Aug 5 06:14:25 2010
@@ -1,14 +1,15 @@
Source: libsys-statistics-linux-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.3.7~)
Build-Depends-Indep: perl, libtest-pod-coverage-perl,
libtest-pod-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Gunnar Wolf <gwolf at debian.org>, Rene Mayorga <rmayorga at debian.org>,
Ryan Niebur <ryan at debian.org>, Jonathan Yu <jawnsy at cpan.org>,
- Franck Joncourt <franck.mail at dthconnex.com>
-Standards-Version: 3.8.3
+ Franck Joncourt <franck.mail at dthconnex.com>,
+ Ansgar Burchardt <ansgar at 43-1.org>
+Standards-Version: 3.9.1
Homepage: http://search.cpan.org/dist/Sys-Statistics-Linux/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libsys-statistics-linux-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libsys-statistics-linux-perl/
Modified: trunk/libsys-statistics-linux-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/copyright?rev=61192&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/copyright (original)
+++ trunk/libsys-statistics-linux-perl/debian/copyright Thu Aug 5 06:14:25 2010
@@ -1,13 +1,10 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Jonny Schulz <jschulz.cpan at bloonix.de>
-Upstream-Source: http://search.cpan.org/dist/Sys-Statistics-Linux/
-Upstream-Name: Sys-Statistics-Linux
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Jonny Schulz <jschulz.cpan at bloonix.de>
+Source: http://search.cpan.org/dist/Sys-Statistics-Linux/
+Name: Sys-Statistics-Linux
-Files: *
Copyright: 2006-2008, Jonny Schulz <jschulz.cpan at bloonix.de>
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
Files: debian/*
Copyright: 2009, Franck Joncourt <franck.mail at dthconnex.com>
@@ -16,18 +13,19 @@
2009, gregor herrmann <gregoa at debian.org>
2008-2009, Rene Mayorga <rmayorga at debian.org>
2008, Gunnar Wolf <gwolf at debian.org>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in /usr/share/common-licenses/Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ On Debian GNU/Linux systems, the complete text of version 1 of the GNU
+ General Public License can be found in `/usr/share/common-licenses/GPL-1'.
Added: trunk/libsys-statistics-linux-perl/debian/patches/df-in-chroot.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/patches/df-in-chroot.patch?rev=61192&op=file
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/patches/df-in-chroot.patch (added)
+++ trunk/libsys-statistics-linux-perl/debian/patches/df-in-chroot.patch Thu Aug 5 06:14:25 2010
@@ -1,0 +1,56 @@
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Thu, 05 Aug 2010 14:58:10 +0900
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/591123
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=60098
+Subject: Tests involving df can fail in chroots
+
+--- libsys-statistics-linux-perl-0.56.orig/t/130-search.t
++++ libsys-statistics-linux-perl-0.56/t/130-search.t
+@@ -25,8 +25,14 @@ my $foo = $stat->search({
+ diskusage => { usageper => qr/\d+/ },
+ });
+
+-foreach my $key (qw/cpustats procstats memstats diskusage/) {
+- ok(exists $foo->{$key} && ref($foo->{$key}) eq 'HASH', "checking $key");
++foreach my $key (qw/cpustats procstats memstats/) {
++ ok(exists $foo->{$key} && ref($foo->{$key}) eq 'HASH', "checking $key");
++}
++SKIP: {
++ if (! %{ $stat->diskusage }) {
++ skip "df returned nothing. Might be in a chroot.", 1;
++ }
++ ok(exists $foo->{diskusage} && ref($foo->{diskusage}) eq 'HASH', "checking diskusage");
+ }
+
+ my %filter = (
+--- libsys-statistics-linux-perl-0.56.orig/t/090-diskusage.t
++++ libsys-statistics-linux-perl-0.56/t/090-diskusage.t
+@@ -22,7 +22,13 @@ my $sys = Sys::Statistics::Linux->new();
+ $sys->set(diskusage => 1);
+ my $stats = $sys->get;
+
+-for my $dev (keys %{$stats->diskusage}) {
+- ok(defined $stats->diskusage->{$dev}->{$_}, "checking diskusage $_") for @diskusage;
+- last; # we check only one device, that should be enough
++SKIP: {
++ if (! %{ $stats->diskusage }) {
++ skip "df returned nothing. Might be in a chroot.", 5;
++ }
++
++ for my $dev (keys %{$stats->diskusage}) {
++ ok(defined $stats->diskusage->{$dev}->{$_}, "checking diskusage $_") for @diskusage;
++ last; # we check only one device, that should be enough
++ }
+ }
+--- libsys-statistics-linux-perl-0.56.orig/lib/Sys/Statistics/Linux/DiskUsage.pm
++++ libsys-statistics-linux-perl-0.56/lib/Sys/Statistics/Linux/DiskUsage.pm
+@@ -96,7 +96,7 @@ sub new {
+ my %self = (
+ cmd => {
+ path => '/bin',
+- df => 'df -kP',
++ df => 'df -kP 2>/dev/null',
+ }
+ );
+
Added: trunk/libsys-statistics-linux-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/patches/series?rev=61192&op=file
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/patches/series (added)
+++ trunk/libsys-statistics-linux-perl/debian/patches/series Thu Aug 5 06:14:25 2010
@@ -1,0 +1,2 @@
+df-in-chroot.patch
+spelling.patch
Added: trunk/libsys-statistics-linux-perl/debian/patches/spelling.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/patches/spelling.patch?rev=61192&op=file
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/patches/spelling.patch (added)
+++ trunk/libsys-statistics-linux-perl/debian/patches/spelling.patch Thu Aug 5 06:14:25 2010
@@ -1,0 +1,229 @@
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Thu, 05 Aug 2010 15:09:49 +0900
+Origin: vendor
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=60100
+Subject: Fix spelling errors
+
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux.pm
+@@ -26,9 +26,9 @@
+
+ =head1 DESCRIPTION
+
+-Sys::Statistics::Linux is a front-end module and gather different linux system informations
++Sys::Statistics::Linux is a front-end module and gather different linux system information
+ like processor workload, memory usage, network and disk statistics and a lot more. Refer the
+-documentation of the distribution modules to get more informations about all possible statistics.
++documentation of the distribution modules to get more information about all possible statistics.
+
+ =head1 MOTIVATION
+
+@@ -73,12 +73,12 @@
+ C<init()>. For any option that is set to 1, the statistics will be initialized by the call of
+ C<new()> or C<set()>. The call of init() re-initialize all statistics that are set to 1 or 2.
+ By the call of C<get()> the initial statistics will be updated automatically. Please refer the
+-section L</METHODS> to get more informations about the usage of C<new()>, C<set()>, C<init()>
++section L</METHODS> to get more information about the usage of C<new()>, C<set()>, C<init()>
+ and C<get()>.
+
+ Another exigence is to sleep for a while - at least for one second - before the call of C<get()>
+ if you want to get useful statistics. The statistics for C<SysInfo>, C<MemStats>, C<SockStats>,
+-C<DiskUsage>, C<LoadAVG> and C<FileStats> are no deltas. If you need only one of these informations
++C<DiskUsage>, C<LoadAVG> and C<FileStats> are no deltas. If you need only one of these information
+ you don't need to sleep before the call of C<get()>.
+
+ The method C<get()> prepares all requested statistics and returns the statistics as a
+@@ -175,9 +175,9 @@
+ This could be helpful if you doesn't run it as daemon and if you want to calculate the
+ average load of your system since the last call. Do you understand? I hope so :)
+
+-To get more informations about the statistics refer the different modules of the distribution.
++To get more information about the statistics refer the different modules of the distribution.
+
+- sysinfo - Collect system informations with Sys::Statistics::Linux::SysInfo.
++ sysinfo - Collect system information with Sys::Statistics::Linux::SysInfo.
+ cpustats - Collect cpu statistics with Sys::Statistics::Linux::CpuStats.
+ procstats - Collect process statistics with Sys::Statistics::Linux::ProcStats.
+ memstats - Collect memory statistics with Sys::Statistics::Linux::MemStats.
+@@ -261,7 +261,7 @@
+
+ $stat->{cpustats}
+
+-Take a look to the documentation of L<Sys::Statistics::Linux::Compilation> for more informations.
++Take a look to the documentation of L<Sys::Statistics::Linux::Compilation> for more information.
+
+ =head2 init()
+
+@@ -312,7 +312,7 @@
+
+ $lxs->settime('%Y/%m/%d %H:%M:%S');
+
+-To get more informations about the formats take a look at C<strftime()> of POSIX.pm
++To get more information about the formats take a look at C<strftime()> of POSIX.pm
+ or the manpage C<strftime(3)>.
+
+ =head2 gettime()
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/CpuStats.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/CpuStats.pm
+@@ -22,7 +22,7 @@
+ Sys::Statistics::Linux::CpuStats gathers cpu statistics from the virtual
+ F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module
++For more information read the documentation of the front-end module
+ L<Sys::Statistics::Linux>.
+
+ =head1 CPU STATISTICS
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/DiskStats.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/DiskStats.pm
+@@ -21,7 +21,7 @@
+
+ Sys::Statistics::Linux::DiskStats gathers disk statistics from the virtual F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module L<Sys::Statistics::Linux>.
++For more information read the documentation of the front-end module L<Sys::Statistics::Linux>.
+
+ =head1 DISK STATISTICS
+
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/DiskUsage.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/DiskUsage.pm
+@@ -13,7 +13,7 @@
+
+ Sys::Statistics::Linux::DiskUsage gathers the disk usage with the command C<df>.
+
+-For more informations read the documentation of the front-end module L<Sys::Statistics::Linux>.
++For more information read the documentation of the front-end module L<Sys::Statistics::Linux>.
+
+ =head1 DISK USAGE INFORMATIONS
+
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/FileStats.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/FileStats.pm
+@@ -13,7 +13,7 @@
+
+ Sys::Statistics::Linux::FileStats gathers file statistics from the virtual F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module L<Sys::Statistics::Linux>.
++For more information read the documentation of the front-end module L<Sys::Statistics::Linux>.
+
+ =head1 FILE STATISTICS
+
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/LoadAVG.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/LoadAVG.pm
+@@ -13,7 +13,7 @@
+
+ Sys::Statistics::Linux::LoadAVG gathers the load average from the virtual F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module L<Sys::Statistics::Linux>.
++For more information read the documentation of the front-end module L<Sys::Statistics::Linux>.
+
+ =head1 LOAD AVERAGE STATISTICS
+
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/MemStats.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/MemStats.pm
+@@ -1,6 +1,6 @@
+ =head1 NAME
+
+-Sys::Statistics::Linux::MemStats - Collect linux memory informations.
++Sys::Statistics::Linux::MemStats - Collect linux memory information.
+
+ =head1 SYNOPSIS
+
+@@ -13,7 +13,7 @@
+
+ Sys::Statistics::Linux::MemStats gathers memory statistics from the virtual F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module L<Sys::Statistics::Linux>.
++For more information read the documentation of the front-end module L<Sys::Statistics::Linux>.
+
+ =head1 MEMORY INFORMATIONS
+
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/NetStats.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/NetStats.pm
+@@ -21,7 +21,7 @@
+
+ Sys::Statistics::Linux::NetStats gathers net statistics from the virtual F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module L<Sys::Statistics::Linux>.
++For more information read the documentation of the front-end module L<Sys::Statistics::Linux>.
+
+ =head1 NET STATISTICS
+
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/PgSwStats.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/PgSwStats.pm
+@@ -21,7 +21,7 @@
+
+ Sys::Statistics::Linux::PgSwStats gathers paging and swapping statistics from the virtual F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module L<Sys::Statistics::Linux>.
++For more information read the documentation of the front-end module L<Sys::Statistics::Linux>.
+
+ =head1 PAGING AND SWAPPING STATISTICS
+
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/ProcStats.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/ProcStats.pm
+@@ -21,7 +21,7 @@
+
+ Sys::Statistics::Linux::ProcStats gathers process statistics from the virtual F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module L<Sys::Statistics::Linux>.
++For more information read the documentation of the front-end module L<Sys::Statistics::Linux>.
+
+ =head1 IMPORTANT
+
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/Processes.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/Processes.pm
+@@ -15,10 +15,10 @@
+
+ =head1 DESCRIPTION
+
+-Sys::Statistics::Linux::Processes gathers process informations from the virtual
++Sys::Statistics::Linux::Processes gathers process information from the virtual
+ F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module
++For more information read the documentation of the front-end module
+ L<Sys::Statistics::Linux>.
+
+ =head1 PROCESS STATISTICS
+@@ -278,7 +278,7 @@
+ next PID;
+ }
+
+- # different other informations for each process
++ # different other information for each process
+ if (open my $fh, '<', "$file->{basedir}/$pid/$file->{stat}") {
+ @{$stats{$pid}}{qw(
+ cmd state ppid pgrp session ttynr minflt
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/SockStats.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/SockStats.pm
+@@ -13,7 +13,7 @@
+
+ Sys::Statistics::Linux::SockStats gathers socket statistics from the virtual F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module L<Sys::Statistics::Linux>.
++For more information read the documentation of the front-end module L<Sys::Statistics::Linux>.
+
+ =head1 SOCKET STATISTICS
+
+--- libsys-statistics-linux-perl.orig/lib/Sys/Statistics/Linux/SysInfo.pm
++++ libsys-statistics-linux-perl/lib/Sys/Statistics/Linux/SysInfo.pm
+@@ -1,6 +1,6 @@
+ =head1 NAME
+
+-Sys::Statistics::Linux::SysInfo - Collect linux system informations.
++Sys::Statistics::Linux::SysInfo - Collect linux system information.
+
+ =head1 SYNOPSIS
+
+@@ -11,9 +11,9 @@
+
+ =head1 DESCRIPTION
+
+-Sys::Statistics::Linux::SysInfo gathers system informations from the virtual F</proc> filesystem (procfs).
++Sys::Statistics::Linux::SysInfo gathers system information from the virtual F</proc> filesystem (procfs).
+
+-For more informations read the documentation of the front-end module L<Sys::Statistics::Linux>.
++For more information read the documentation of the front-end module L<Sys::Statistics::Linux>.
+
+ =head1 SYSTEM INFOMATIONS
+
Modified: trunk/libsys-statistics-linux-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/rules?rev=61192&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/rules (original)
+++ trunk/libsys-statistics-linux-perl/debian/rules Thu Aug 5 06:14:25 2010
@@ -1,4 +1,4 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --buildsystem=perl_build
Added: trunk/libsys-statistics-linux-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/source/format?rev=61192&op=file
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/source/format (added)
+++ trunk/libsys-statistics-linux-perl/debian/source/format Thu Aug 5 06:14:25 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the Pkg-perl-cvs-commits
mailing list