r66195 - in /trunk/libhash-merge-simple-perl: Changes MANIFEST META.yml Makefile.PL README debian/changelog debian/control debian/copyright debian/source/ debian/source/format lib/Hash/Merge/Simple.pm t/release/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Fri Dec 24 19:36:20 UTC 2010
Author: jawnsy-guest
Date: Fri Dec 24 19:35:52 2010
New Revision: 66195
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=66195
Log:
TODO:
I'm not sure if we should upload this. It fixes a bug where
use base 'Exporter'
is used without doing
require Exporter
first. I'm unsure whether this will cause FTBFS/etc.
+ Actually loads Exporter before subclassing it
* Standards-Version 3.9.1 (no changes)
* Use new 3.0 (quilt) source format
* Refresh copyright information
Added:
trunk/libhash-merge-simple-perl/debian/source/
trunk/libhash-merge-simple-perl/debian/source/format
Removed:
trunk/libhash-merge-simple-perl/t/release/
Modified:
trunk/libhash-merge-simple-perl/Changes
trunk/libhash-merge-simple-perl/MANIFEST
trunk/libhash-merge-simple-perl/META.yml
trunk/libhash-merge-simple-perl/Makefile.PL
trunk/libhash-merge-simple-perl/README
trunk/libhash-merge-simple-perl/debian/changelog
trunk/libhash-merge-simple-perl/debian/control
trunk/libhash-merge-simple-perl/debian/copyright
trunk/libhash-merge-simple-perl/lib/Hash/Merge/Simple.pm
Modified: trunk/libhash-merge-simple-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhash-merge-simple-perl/Changes?rev=66195&op=diff
==============================================================================
--- trunk/libhash-merge-simple-perl/Changes (original)
+++ trunk/libhash-merge-simple-perl/Changes Fri Dec 24 19:35:52 2010
@@ -4,6 +4,9 @@
- merge( dclone / deep_clone / storable_clone => ...
- merge( [] ) # Transform even-element array into a hash
- merge( [], [], ... ) # Merge even-element arrays (at the top level only)
+
+0.051 Tuesday December 07 12:21:04 PST 2010:
+ - Duh, require Exporter. Thanks, EVERYBODY/KENTNL
0.050 Thursday May 13 11:24:29 PDT 2010:
- Conversion to Dist::Zilla (Dzpl), losing auto_install
Modified: trunk/libhash-merge-simple-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhash-merge-simple-perl/MANIFEST?rev=66195&op=diff
==============================================================================
--- trunk/libhash-merge-simple-perl/MANIFEST (original)
+++ trunk/libhash-merge-simple-perl/MANIFEST Fri Dec 24 19:35:52 2010
@@ -7,6 +7,3 @@
t/00-load.t
t/01-basic.t
t/9000-bug-41738-merge-with-side-effects.t
-t/release/boilerplate.t
-t/release/pod-coverage.t
-t/release/pod.t
Modified: trunk/libhash-merge-simple-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhash-merge-simple-perl/META.yml?rev=66195&op=diff
==============================================================================
--- trunk/libhash-merge-simple-perl/META.yml (original)
+++ trunk/libhash-merge-simple-perl/META.yml Fri Dec 24 19:35:52 2010
@@ -3,18 +3,17 @@
author:
- 'Robert Krimen <robertkrimen at gmail.com>'
build_requires:
- Test::Deep: 0
Test::Most: 0
configure_requires:
ExtUtils::MakeMaker: 6.31
-generated_by: 'Dist::Zilla version 2.101170'
+dynamic_config: 0
+generated_by: 'Dist::Zilla version 4.102345, CPAN::Meta::Converter version 2.102400'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
name: Hash-Merge-Simple
-recommends: {}
requires:
Clone: 0
Storable: 0
-version: 0.05
+version: 0.051
Modified: trunk/libhash-merge-simple-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhash-merge-simple-perl/Makefile.PL?rev=66195&op=diff
==============================================================================
--- trunk/libhash-merge-simple-perl/Makefile.PL (original)
+++ trunk/libhash-merge-simple-perl/Makefile.PL Fri Dec 24 19:35:52 2010
@@ -9,36 +9,35 @@
my %WriteMakefileArgs = (
- 'test' => {
- 'TESTS' => 't/*.t t/release/*.t'
- },
- 'NAME' => 'Hash::Merge::Simple',
- 'DISTNAME' => 'Hash-Merge-Simple',
- 'CONFIGURE_REQUIRES' => {
- 'ExtUtils::MakeMaker' => '6.31'
- },
- 'AUTHOR' => 'Robert Krimen <robertkrimen at gmail.com>',
- 'BUILD_REQUIRES' => {
- 'Test::Most' => '0',
- 'Test::Deep' => '0'
- },
- 'ABSTRACT' => 'Recursively merge two or more hashes, simply',
- 'EXE_FILES' => [],
- 'VERSION' => '0.05',
- 'PREREQ_PM' => {
- 'Clone' => '0',
- 'Storable' => '0'
- },
- 'LICENSE' => 'perl'
- );
+ 'ABSTRACT' => 'Recursively merge two or more hashes, simply',
+ 'AUTHOR' => 'Robert Krimen <robertkrimen at gmail.com>',
+ 'BUILD_REQUIRES' => {
+ 'Test::Most' => '0'
+ },
+ 'CONFIGURE_REQUIRES' => {
+ 'ExtUtils::MakeMaker' => '6.31'
+ },
+ 'DISTNAME' => 'Hash-Merge-Simple',
+ 'EXE_FILES' => [],
+ 'LICENSE' => 'perl',
+ 'NAME' => 'Hash::Merge::Simple',
+ 'PREREQ_PM' => {
+ 'Clone' => '0',
+ 'Storable' => '0'
+ },
+ 'VERSION' => '0.051',
+ 'test' => {
+ 'TESTS' => 't/*.t'
+ }
+);
unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) {
my $br = delete $WriteMakefileArgs{BUILD_REQUIRES};
- my $pp = $WriteMakefileArgs{PREREQ_PM};
+ my $pp = $WriteMakefileArgs{PREREQ_PM};
for my $mod ( keys %$br ) {
if ( exists $pp->{$mod} ) {
- $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod};
+ $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod};
}
else {
$pp->{$mod} = $br->{$mod};
Modified: trunk/libhash-merge-simple-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhash-merge-simple-perl/README?rev=66195&op=diff
==============================================================================
--- trunk/libhash-merge-simple-perl/README (original)
+++ trunk/libhash-merge-simple-perl/README Fri Dec 24 19:35:52 2010
@@ -2,7 +2,7 @@
Hash::Merge::Simple - Recursively merge two or more hashes, simply
VERSION
- version 0.05
+ version 0.051
SYNOPSIS
use Hash::Merge::Simple qw/ merge /;
@@ -100,7 +100,7 @@
Yuval Kogman "nothingmuch at woobling.org"
AUTHOR
- Robert Krimen <robertkrimen at gmail.com>
+ Robert Krimen <robertkrimen at gmail.com>
COPYRIGHT AND LICENSE
This software is copyright (c) 2010 by Robert Krimen.
Modified: trunk/libhash-merge-simple-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhash-merge-simple-perl/debian/changelog?rev=66195&op=diff
==============================================================================
--- trunk/libhash-merge-simple-perl/debian/changelog (original)
+++ trunk/libhash-merge-simple-perl/debian/changelog Fri Dec 24 19:35:52 2010
@@ -1,10 +1,18 @@
-libhash-merge-simple-perl (0.05-1) UNRELEASED; urgency=low
+libhash-merge-simple-perl (0.051-1) UNRELEASED; urgency=low
- This switches the distribution to Dist::Zilla
- IGNORE-VERSION: 0.05-1
+ TODO:
+ I'm not sure if we should upload this. It fixes a bug where
+ use base 'Exporter'
+ is used without doing
+ require Exporter
+ first. I'm unsure whether this will cause FTBFS/etc.
[ Jonathan Yu ]
* New upstream release
+ + Actually loads Exporter before subclassing it
+ * Standards-Version 3.9.1 (no changes)
+ * Use new 3.0 (quilt) source format
+ * Refresh copyright information
[ Salvatore Bonaccorso ]
* debian/control: Changed: Replace versioned (build-)dependency on
@@ -14,7 +22,7 @@
[ Ryan Niebur ]
* Update jawnsy's email address
- -- Jonathan Yu <jawnsy at cpan.org> Thu, 13 May 2010 22:14:57 -0400
+ -- Jonathan Yu <jawnsy at cpan.org> Fri, 24 Dec 2010 14:48:15 -0500
libhash-merge-simple-perl (0.04-1) unstable; urgency=low
Modified: trunk/libhash-merge-simple-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhash-merge-simple-perl/debian/control?rev=66195&op=diff
==============================================================================
--- trunk/libhash-merge-simple-perl/debian/control (original)
+++ trunk/libhash-merge-simple-perl/debian/control Fri Dec 24 19:35:52 2010
@@ -5,7 +5,7 @@
Build-Depends-Indep: perl, libtest-most-perl, libtest-deep-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.9.1
Homepage: http://search.cpan.org/dist/Hash-Merge-Simple/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhash-merge-simple-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libhash-merge-simple-perl/
Modified: trunk/libhash-merge-simple-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhash-merge-simple-perl/debian/copyright?rev=66195&op=diff
==============================================================================
--- trunk/libhash-merge-simple-perl/debian/copyright (original)
+++ trunk/libhash-merge-simple-perl/debian/copyright Fri Dec 24 19:35:52 2010
@@ -1,28 +1,28 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Robert Krimen <rkrimen at cpan.org>
-Upstream-Source: http://search.cpan.org/dist/Hash-Merge-Simple/
-Upstream-Name: Hash-Merge-Simple
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Robert Krimen <robertkrimen at gmail.com>
+Source: http://search.cpan.org/dist/Hash-Merge-Simple/
+Name: Hash-Merge-Simple
Files: *
-Copyright: 2008, Robert Krimen <rkrimen at cpan.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2010, Robert Krimen <robertkrimen at gmail.com>
+License: Artistic or GPL-1+
Files: debian/*
Copyright: 2009-2010, Jonathan Yu <jawnsy at cpan.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 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 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/libhash-merge-simple-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhash-merge-simple-perl/debian/source/format?rev=66195&op=file
==============================================================================
--- trunk/libhash-merge-simple-perl/debian/source/format (added)
+++ trunk/libhash-merge-simple-perl/debian/source/format Fri Dec 24 19:35:52 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/libhash-merge-simple-perl/lib/Hash/Merge/Simple.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhash-merge-simple-perl/lib/Hash/Merge/Simple.pm?rev=66195&op=diff
==============================================================================
--- trunk/libhash-merge-simple-perl/lib/Hash/Merge/Simple.pm (original)
+++ trunk/libhash-merge-simple-perl/lib/Hash/Merge/Simple.pm Fri Dec 24 19:35:52 2010
@@ -1,15 +1,16 @@
package Hash::Merge::Simple;
BEGIN {
- $Hash::Merge::Simple::VERSION = '0.05';
+ $Hash::Merge::Simple::VERSION = '0.051';
}
# ABSTRACT: Recursively merge two or more hashes, simply
use warnings;
use strict;
-use vars qw/@ISA @EXPORT_OK/;
- at ISA = qw/Exporter/;
- at EXPORT_OK = qw/merge clone_merge dclone_merge/;
+use vars qw/ @ISA @EXPORT_OK /;
+require Exporter;
+ at ISA = qw/ Exporter /;
+ at EXPORT_OK = qw/ merge clone_merge dclone_merge /;
# This was stoled from Catalyst::Utils... thanks guys!
@@ -67,7 +68,7 @@
=head1 VERSION
-version 0.05
+version 0.051
=head1 SYNOPSIS
@@ -170,7 +171,7 @@
=head1 AUTHOR
- Robert Krimen <robertkrimen at gmail.com>
+Robert Krimen <robertkrimen at gmail.com>
=head1 COPYRIGHT AND LICENSE
More information about the Pkg-perl-cvs-commits
mailing list