re-work META.yml validation and fix the detected errors

Changes

@@ -11,6 +11,9 @@ Bug fixes:
  - re-work, document and test Imager's logging facility.
    https://rt.cpan.org/Ticket/Display.html?id=65227
 
+ - fix META.yml testing and the generated META.yml
+   https://rt.cpan.org/Ticket/Display.html?id=65235
+
 Imager 0.83 - 21 May 2011
 ===========
 

MANIFEST

@@ -326,6 +326,8 @@ t/t91pod.t			Test POD with Test::Pod
 t/t92samples.t
 t/t93podcover.t			POD Coverage tests
 t/t94kwalitee.t			Various "kwalitee" tests
+t/t95log.t
+t/t98meta.t
 t/t99thread.t			Test wrt to perl threads
 t/tr18561.t			Regression tests
 t/tr18561b.t

Makefile.PL

@@ -220,17 +220,8 @@ if ($MM_ver >= 6.46) {
      resources =>
      {
       homepage => "http://imager.perl.org/",
-      repository =>
-      {
-       url => "git://git.imager.perl.org/imager.git",
-       web => "http://git.imager.perl.org/imager.git",
-       type => "git",
-      },
-      bugtracker =>
-      {
-       web => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
-       mailto => 'bug-Imager@rt.cpan.org',
-      },
+      repository => "git://git.imager.perl.org/imager.git",
+      bugtracker => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
      },
     };
 }

t/t98meta.t

@@ -0,0 +1,19 @@
+#!perl -w
+use strict;
+use Test::More;
+plan skip_all => "Only run as part of the dist"
+  unless -f "META.yml";
+eval "use CPAN::Meta 2.0;";
+plan skip_all => "CPAN::Meta required for testing META.yml"
+  if $@;
+plan skip_all => "Only if automated or author testing"
+  unless $ENV{AUTOMATED_TESTING} || -d "../.git";
+plan tests => 1;
+
+my $meta;
+unless (ok(eval {
+  $meta = CPAN::Meta->load_file("META.yml",
+				{ lazy_validation => 0 }) },
+	   "loaded META.yml successfully")) {
+  diag($@);
+}