r11270 - in /trunk/libwebservice-cia-perl: ./ debian/ lib/WebService/ lib/WebService/CIA/ lib/WebService/CIA/Source/
zakame-guest at users.alioth.debian.org
zakame-guest at users.alioth.debian.org
Mon Dec 17 08:36:57 UTC 2007
Author: zakame-guest
Date: Mon Dec 17 08:36:57 2007
New Revision: 11270
URL: http://svn.debian.org/wsvn/?sc=1&rev=11270
Log:
Update to WebService::CIA 1.3
Update source and Debian changes to WebService::CIA 1.3, conforming
to Standards-Version 3.7.3.
Modified:
trunk/libwebservice-cia-perl/Build.PL
trunk/libwebservice-cia-perl/Changes
trunk/libwebservice-cia-perl/META.yml
trunk/libwebservice-cia-perl/debian/changelog
trunk/libwebservice-cia-perl/debian/control
trunk/libwebservice-cia-perl/debian/rules
trunk/libwebservice-cia-perl/lib/WebService/CIA.pm
trunk/libwebservice-cia-perl/lib/WebService/CIA/Parser.pm
trunk/libwebservice-cia-perl/lib/WebService/CIA/Source.pm
trunk/libwebservice-cia-perl/lib/WebService/CIA/Source/DBM.pm
trunk/libwebservice-cia-perl/lib/WebService/CIA/Source/Web.pm
Modified: trunk/libwebservice-cia-perl/Build.PL
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/Build.PL?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/Build.PL (original)
+++ trunk/libwebservice-cia-perl/Build.PL Mon Dec 17 08:36:57 2007
@@ -12,6 +12,10 @@
'LWP::UserAgent' => '2.0',
'Crypt::SSLeay' => '0',
},
+ build_requires => {
+ 'Test::More' => '0',
+ 'Module::Build' => '0',
+ },
create_makefile_pl => 'passthrough',
);
Modified: trunk/libwebservice-cia-perl/Changes
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/Changes?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/Changes (original)
+++ trunk/libwebservice-cia-perl/Changes Mon Dec 17 08:36:57 2007
@@ -23,3 +23,9 @@
- Added tests for generated URLs (flag URL, etc.)
- Renamed some tests.
- Fixed typo, email address, and copyright.
+
+1.3 2007-12-03
+
+ - Minor tweaks from Perl::Critic
+ - Added "use warnings" to WebService::CIA::Source::DBM
+ - Fixed error in documentation for WebService::CIA::Source::DBM
Modified: trunk/libwebservice-cia-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/META.yml?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/META.yml (original)
+++ trunk/libwebservice-cia-perl/META.yml Mon Dec 17 08:36:57 2007
@@ -1,6 +1,6 @@
---
name: WebService-CIA
-version: 1.2
+version: 1.3
author:
- Ian Malpass (ian-cpan at indecorous.com)
abstract: Get information from the CIA World Factbook.
@@ -13,22 +13,25 @@
LWP::UserAgent: 2.0
MLDBM: 2.01
Storable: 2.0
+build_requires:
+ Module::Build: 0
+ Test::More: 0
provides:
WebService::CIA:
file: lib/WebService/CIA.pm
- version: 1.2
+ version: 1.3
WebService::CIA::Parser:
file: lib/WebService/CIA/Parser.pm
- version: 1.2
+ version: 1.3
WebService::CIA::Source:
file: lib/WebService/CIA/Source.pm
- version: 1.2
+ version: 1.3
WebService::CIA::Source::DBM:
file: lib/WebService/CIA/Source/DBM.pm
- version: 1.2
+ version: 1.3
WebService::CIA::Source::Web:
file: lib/WebService/CIA/Source/Web.pm
- version: 1.2
+ version: 1.3
generated_by: Module::Build version 0.2806
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.2.html
Modified: trunk/libwebservice-cia-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/debian/changelog?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/debian/changelog (original)
+++ trunk/libwebservice-cia-perl/debian/changelog Mon Dec 17 08:36:57 2007
@@ -1,3 +1,14 @@
+libwebservice-cia-perl (1.3-1) unstable; urgency=low
+
+ * New upstream release, now part of pkg-perl SVN
+ * debian/control:
+ + Update Standards-Version to 3.7.3
+ * debian/rules:
+ + Use --installdirs flag instead of setting a variable
+ + Do not include .packlist files created by Build
+
+ -- Zak B. Elep <zakame at spunge.org> Mon, 17 Dec 2007 16:25:19 +0800
+
libwebservice-cia-perl (1.2-1) unstable; urgency=low
* Initial Release. (Closes: #429785)
Modified: trunk/libwebservice-cia-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/debian/control?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/debian/control (original)
+++ trunk/libwebservice-cia-perl/debian/control Mon Dec 17 08:36:57 2007
@@ -5,7 +5,7 @@
Build-Depends-Indep: perl (>= 5.8.8-7)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Zak B. Elep <zakame at spunge.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: libwebservice-cia-perl
Architecture: all
Modified: trunk/libwebservice-cia-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/debian/rules?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/debian/rules (original)
+++ trunk/libwebservice-cia-perl/debian/rules Mon Dec 17 08:36:57 2007
@@ -29,7 +29,7 @@
dh_testdir
# Add commands to compile the package here
- echo "n" | $(PERL) Build.PL installdirs=vendor
+ echo "n" | $(PERL) Build.PL --installdirs vendor
OPTIMIZE="-Wall -O2 -g" $(PERL) Build
touch build-stamp
@@ -55,6 +55,7 @@
rm -f $(TMP)/usr/bin/webservice-cia-makedbm.pl
rm -rf $(TMP)/usr/bin
+ rm -rf $(TMP)/usr/lib
touch install-stamp
Modified: trunk/libwebservice-cia-perl/lib/WebService/CIA.pm
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/lib/WebService/CIA.pm?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/lib/WebService/CIA.pm (original)
+++ trunk/libwebservice-cia-perl/lib/WebService/CIA.pm Mon Dec 17 08:36:57 2007
@@ -5,7 +5,7 @@
use warnings;
use Carp;
-our $VERSION = '1.2';
+our $VERSION = '1.3';
$WebService::CIA::base_url = "https://www.cia.gov/library/publications/the-world-factbook/";
@@ -39,9 +39,8 @@
my $self = shift;
my $country = shift;
- my $cc;
my $data = {};
- foreach $cc (@$country) {
+ foreach my $cc (@$country) {
$data->{$cc} = $self->source->all($cc);
}
return $data;
@@ -52,11 +51,10 @@
my $self = shift;
my ($country, $field) = @_;
- my ($cc, $f);
my $data = {};
- foreach $cc (@$country) {
+ foreach my $cc (@$country) {
$data->{$cc} = {};
- foreach $f (@$field) {
+ foreach my $f (@$field) {
$data->{$cc}->{$f} = $self->source->value($cc, $f);
}
}
Modified: trunk/libwebservice-cia-perl/lib/WebService/CIA/Parser.pm
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/lib/WebService/CIA/Parser.pm?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/lib/WebService/CIA/Parser.pm (original)
+++ trunk/libwebservice-cia-perl/lib/WebService/CIA/Parser.pm Mon Dec 17 08:36:57 2007
@@ -5,7 +5,7 @@
use warnings;
use WebService::CIA;
-our $VERSION = '1.2';
+our $VERSION = '1.3';
sub new {
Modified: trunk/libwebservice-cia-perl/lib/WebService/CIA/Source.pm
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/lib/WebService/CIA/Source.pm?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/lib/WebService/CIA/Source.pm (original)
+++ trunk/libwebservice-cia-perl/lib/WebService/CIA/Source.pm Mon Dec 17 08:36:57 2007
@@ -4,7 +4,7 @@
use strict;
use warnings;
-our $VERSION = '1.2';
+our $VERSION = '1.3';
# Preloaded methods go here.
@@ -28,7 +28,7 @@
if ($cc eq 'testcountry' and $f eq 'Test') {
return 'Wombat';
} else {
- return undef;
+ return;
}
}
Modified: trunk/libwebservice-cia-perl/lib/WebService/CIA/Source/DBM.pm
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/lib/WebService/CIA/Source/DBM.pm?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/lib/WebService/CIA/Source/DBM.pm (original)
+++ trunk/libwebservice-cia-perl/lib/WebService/CIA/Source/DBM.pm Mon Dec 17 08:36:57 2007
@@ -2,6 +2,7 @@
require 5.005_62;
use strict;
+use warnings;
use Fcntl;
use MLDBM qw(DB_File Storable);
use Carp;
@@ -9,7 +10,7 @@
@WebService::CIA::Source::DBM::ISA = ("WebService::CIA::Source");
-our $VERSION = '1.2';
+our $VERSION = '1.3';
sub new {
@@ -24,9 +25,9 @@
my $mode;
if (exists $opts->{Mode} && $opts->{Mode} eq "readwrite") {
- tie %{$self->{DBM}}, "MLDBM", $opts->{DBM}, O_CREAT|O_RDWR, 0640 or croak "WebService::CIA::Source::DBM: Can't open DBM: $!";
+ tie %{$self->{DBM}}, "MLDBM", $opts->{DBM}, O_CREAT|O_RDWR, 0640 or croak "WebService::CIA::Source::DBM: Can't open DBM: $!"; ## no critic (ProhibitLeadingZeros)
} elsif (-e $opts->{DBM}) {
- tie %{$self->{DBM}}, "MLDBM", $opts->{DBM}, O_RDONLY, 0440 or croak "WebService::CIA::Source::DBM: Can't open DBM: $!";
+ tie %{$self->{DBM}}, "MLDBM", $opts->{DBM}, O_RDONLY, 0440 or croak "WebService::CIA::Source::DBM: Can't open DBM: $!"; ## no critic (ProhibitLeadingZeros)
} else {
croak "WebService::CIA::Source::DBM: $opts->{DBM}: $!";
}
@@ -43,7 +44,7 @@
if (exists $self->dbm->{$country} and exists $self->dbm->{$country}->{$field}) {
return $self->dbm->{$country}->{$field};
} else {
- return undef;
+ return;
}
}
@@ -90,8 +91,8 @@
use WebService::CIA::Source::DBM;
my $source = WebService::CIA::Source::DBM->new({
- Source => 'factbook.dbm',
- Mode => 'read'
+ DBM => 'factbook.dbm',
+ Mode => 'read'
});
Modified: trunk/libwebservice-cia-perl/lib/WebService/CIA/Source/Web.pm
URL: http://svn.debian.org/wsvn/trunk/libwebservice-cia-perl/lib/WebService/CIA/Source/Web.pm?rev=11270&op=diff
==============================================================================
--- trunk/libwebservice-cia-perl/lib/WebService/CIA/Source/Web.pm (original)
+++ trunk/libwebservice-cia-perl/lib/WebService/CIA/Source/Web.pm Mon Dec 17 08:36:57 2007
@@ -11,7 +11,7 @@
@WebService::CIA::Source::Web::ISA = ("WebService::CIA::Source");
-our $VERSION = '1.2';
+our $VERSION = '1.3';
# Preloaded methods go here.
@@ -37,14 +37,14 @@
unless ($self->cached eq $cc) {
unless ($self->get($cc)) {
- return undef;
+ return;
}
}
if (exists $self->cache->{$f}) {
return $self->cache->{$f};
} else {
- return undef;
+ return;
}
}
More information about the Pkg-perl-cvs-commits
mailing list