[libdist-zilla-plugin-test-eol-perl] 20/28: Merge remote-tracking branch 'dzil-base/master'

[Intrigeri]

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

intrigeri pushed a commit to annotated tag 0.03
in repository libdist-zilla-plugin-test-eol-perl.

commit 05972a70e6a8d65fe6d82f8de932129c73fed6b7
Merge: b51fa1a 2a62b1e
Author: Caleb Cushing <xenoterracide at gmail.com>
Date:   Sun Dec 11 01:09:47 2011 -0600

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

 .gitignore    | 21 +++++++++++++++++----
 dist.ini      | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
 perlcritic.rc |  2 ++
 weaver.ini    | 24 ++++++++++++++++++++++++
 4 files changed, 90 insertions(+), 14 deletions(-)

diff --cc .gitignore
index 6e64341,c60370b..8895840
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,16 +1,17 @@@
- .*
- !.gitignore
- Dist-Zilla-Plugin-EOLTests-*
- Debian_CPANTS.txt
++Dist-Zilla-Plugin-Test-EOL-*
+ .build
+ *.swp
+ *.bak
+ *~
+ *.old
+ Makefile
+ blib/
+ pm_to_blib
+ Build
+ _build
+ cover_db/
+ nytprof*
+ *.patch
+ .DS_Store
+ MYMETA.*
+ *.o
diff --cc dist.ini
index 08ef6e0,584ef45..d611342
--- a/dist.ini
+++ b/dist.ini
@@@ -1,15 -1,51 +1,52 @@@
 +name = Dist-Zilla-Plugin-Test-EOL
- version = 0.02
 +author = Florian Ragwitz <rafl at debian.org>
- license = Perl_5
- copyright_holder = Florian Ragwitz
+ author  = Caleb Cushing <xenoterracide at gmail.com>
+ license = Artistic_2_0
+ copyright_holder = Caleb Cushing
 -copyright_year   = 2011
  
- [@FLORA]
- dist = Dist-Zilla-Plugin-Test-EOL
- repository_at = github
+ [ReadmeFromPod]
+ [@Filter]
+ 	-bundle = @Basic
+ 	-remove = Readme
  
- [Prereq]
- Test::EOL = 0
- Dist::Zilla = 4.101540
+ [AutoPrereqs]
  
- [CompileTests]
+ [SubmittingPatches]
+ [OurPkgVersion]
+ [PodWeaver]
+ 
+ [MetaNoIndex]
+ 	file = perlcritic.rc
+ 
+ [MetaJSON]
+ 
+ [NextRelease]
+ 	format = %-9v %{yyyy-MM-dd}d
+ 
+ [ReportVersions::Tiny]
+ [@TestingMania]
+ 	disable = NoTabsTests
+ 	critic_config = perlcritic.rc
+ [ExtraTests]
+ 
+ [Test::PodSpelling]
+     stopwords = SubmittingPatches
+ 
+ [PruneFiles]
+ 	filenames = dist.ini
+ 	filenames = weaver.ini
+ 
+ [@GitHub]
+ [@Git]
+ 	push_to     = my
+ 	tag_format  = %v
+ 	tag_message = %v
+ 	commit_msg  = %v%n%n%c
+ 
+ [Git::CommitBuild]
+ [Git::NextVersion]
+ 	first_version = 0.001000
+ 	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-eol-perl.git