Merge branch 'release/1.3050'

fgabolde · May 20, 2011 · 8ac3d59 · 8ac3d59
2 parents bce041a + 5db0f40
commit 8ac3d59
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 58 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,14 @@
-1.3049_01  14.05.2011
+1.3050      20.05.2011
+    ** Codename: The Captain Hook Adventure // Franck Cuny **
+
+    [ ENHANCEMENTS ]
+    * No functional changes, just releasing as stable.
+
+    [ DOCUMENTATION ]
+    * Improve Dancer documentation
+      (Damien Krotkine)
+
+1.3049_01   14.05.2011
 
     [ API CHANGES ]
     * Deprecation of 'logger' (use set). (Alberto Simões)

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -13,3 +13,4 @@ Makefile$
 ^run_perltidy.sh$
 ^.*\.swp$
 lib/Dancer/Plugin/WebSocket.pm
+^.*~$
diff --git a/Makefile.PL b/Makefile.PL
@@ -13,6 +13,10 @@ tags:
         --exclude=.git \
         --exclude='*.swp' \
         --languages=Perl --langmap=Perl:+.t 
+
+author_test:
+	RELEASE_TESTING=1 $(MAKE) test
+
 MAKE_FRAG
 }
 
@@ -22,7 +26,7 @@ WriteMakefile1(
     LICENSE      => 'perl',
     VERSION_FROM => 'lib/Dancer.pm',
     EXE_FILES    => ['script/dancer'],
-    
+
     META_MERGE => {
         resources => {
             repository => 'http://github.com/sukria/Dancer',
@@ -32,7 +36,8 @@ WriteMakefile1(
     },
 
     BUILD_REQUIRES => {
-        'Test::More'             => '0.94',
+        'Test::More'              => '0.94',
+        'Tie::Hash::NamedCapture' => '0',
     },
 
     PREREQ_PM => {