[libdist-zilla-plugin-test-podspelling-perl] 31/86: Merge remote-tracking branch 'dzil-base/master'

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to annotated tag 2.001001
in repository libdist-zilla-plugin-test-podspelling-perl.

commit 15fe02815f8d8d99dff01c9a485fd0ce7053bbb7
Merge: edb8d8c c4f2b13
Author: Caleb Cushing <xenoterracide at gmail.com>
Date:   Tue Aug 2 04:04:27 2011 -0500

    Merge remote-tracking branch 'dzil-base/master'
    
    Conflicts:
    	.gitignore
    	dist.ini
    
    Signed-off-by: Caleb Cushing <xenoterracide at gmail.com>

 .gitignore    |  2 ++
 dist.ini      | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 perlcritic.rc |  2 ++
 weaver.ini    | 24 ++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 3 deletions(-)

diff --cc .gitignore
index 9b77d50,86b3eeb..9f3674c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,3 @@@
 +Dist-Zilla-Plugin-PodSpellingTests-*
+ .build
+ *.swp
diff --cc dist.ini
index 85f6404,86608e0..be6b985
--- a/dist.ini
+++ b/dist.ini
@@@ -1,10 -1,51 +1,58 @@@
 -author  = Caleb Cushing <xenoterracide at gmail.com>
 +name = Dist-Zilla-Plugin-PodSpellingTests
++author = Caleb Cushing <xenoterracide at gmail.com>
 +author = Marcel Gruenauer <marcel at cpan.org>
 +author = Harley Pig <harleypig at gmail.com>
- copyright_year = 2010
- 
- [@MARCEL]
+ license = Artistic_2_0
+ copyright_holder = Caleb Cushing
+ copyright_year   = 2011
  
 +[Prereqs]
 +Test::Spelling = 0
 +Pod::Wordlist::hanekomu = 0
++
+ [MetaResources]
+ 	repository.type = git
+ 
+ [ReadmeFromPod]
+ [@Filter]
+ 	-bundle = @Basic
+ 	-remove = Readme
+ 
+ [AutoPrereqs]
+ 
+ [SubmittingPatches]
+ [OurPkgVersion]
+ [PodWeaver]
+ 
+ [MetaNoIndex]
+ 	file = perlcritic.rc
+ 
+ [MetaJSON]
+ 
+ [NextRelease]
+ 	format = %-9v %{yyyy-MM-dd}d
+ 
+ [@TestingMania]
+ 	disable = NoTabsTests
+ 	critic_config = perlcritic.rc
+ [ExtraTests]
+ 
+ [PodSpellingTests]
+     wordlist  = Pod::Wordlist::hanekomu
+     stopwords = SubmittingPatches
+ 
+ [PruneFiles]
+ 	filenames = dist.ini
+ 	filenames = weaver.ini
+ 
+ [@Git]
+ 	push_to = my
+ 	tag_format = %v
+ 
+ [Git::CommitBuild]
+ [Git::NextVersion]
+ 	first_version = 0.1.0
+ 	version_regexp = ^(.+)$
+ 
+ [CheckChangesHasContent]
+ [Clean]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdist-zilla-plugin-test-podspelling-perl.git