From e9d32a350ee3ff1966ada3545f6ae18ff1f6a980 Mon Sep 17 00:00:00 2001
From: Gianni Ceccarelli <gianni.ceccarelli@net-a-porter.com>
Date: Tue, 29 Jul 2014 09:38:06 +0100
Subject: update dzil & weaver

---
 dist.ini   | 19 +++++++++++++------
 weaver.ini |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/dist.ini b/dist.ini
index c4aebf3..a2ff86c 100644
--- a/dist.ini
+++ b/dist.ini
@@ -1,7 +1,7 @@
 author  = Gianni Ceccarelli <dakkar@thenautilus.net>
 license = Perl_5
 copyright_holder = Gianni Ceccarelli <dakkar@thenautilus.net>
-copyright_year   = 2013
+copyright_year   = 2014
 
 [GatherDir]
 
@@ -38,8 +38,9 @@ first_version = 0.0.1
 
 [ExtraTests]
 
-[MetaNoIndex]
+[Repository]
 
+[MetaNoIndex]
 directory = t/lib
 
 [MetaYAML]
@@ -55,6 +56,8 @@ dir = scripts
 
 [Manifest]
 
+[License]
+
 [TestRelease]
 
 [FakeRelease]
@@ -62,13 +65,17 @@ dir = scripts
 [Git::Commit]
 
 [Git::CommitBuild]
+branch =
+release_branch = release/%b
+release_message = Dzil-build release %v (from %h on %b)
+multiple_inheritance = 1
 
 [Git::Tag / master]
 tag_format = v%v-dzilla
 
-[Git::Tag / build]
-branch = build/master
+[Git::Tag / release]
+branch = release
 tag_format = v%v
 
-;[ConfirmRelease]
-;[UploadToCPAN]
+[ConfirmRelease]
+[UploadToCPAN]
diff --git a/weaver.ini b/weaver.ini
index c4643b6..a28e4da 100644
--- a/weaver.ini
+++ b/weaver.ini
@@ -1,6 +1,6 @@
 [@CorePrep]
 
-[-Encoding]
+[SingleEncoding]
 
 [Name]
 [Version]
-- 
cgit v1.2.3