Merge rafl's 0.04

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..d776baf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+.*
+!.gitignore
+Makefile*
+!Makefile.PL
+META.yml
+blib
+build
+inc
+pm_to_blib
+MANIFEST*
+!MANIFEST.SKIP
+Debian*
+README
+MooseX-Types-DateTime-*
+*.bs

diff --git a/Changes b/Changes
index 8a03a1d..c302398 100755 (executable)
--- a/Changes
+++ b/Changes
@@ -1,9 +1,17 @@
-0.04
+0.05
+               - Merged the two 0.04 releases
+
+0.04 (NUFFIN)
         - Remove DateTimeX::Easy support, this is in its own distribution now
 
+0.04 (FLORA)
+        - Depend on DateTime::TimeZone 0.95 to avoid test failures due to
+          broken, older versions.
+
 0.03
         - more explicit versions for dependencies
                - removed a test that doesn't seem to cleanly pass in all timezones
+
 0.02
         - Use namespace::clean in some places
         - Try to skip out of the test suite gracefully when bad crap happens

diff --git a/Makefile.PL b/Makefile.PL
index e3a7142..a6818d6 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -14,7 +14,7 @@ WriteMakefile(
         'Moose'              => '0.41', # class_type
         'DateTime'           => '0.4302',
         'DateTime::Locale'   => '0.4001',
-        'DateTime::TimeZone' => '0.7701',
+        'DateTime::TimeZone' => '0.95',
         'Test::use::ok'      => '0.02',
         'Test::Exception'    => '0.27',
         'namespace::clean'   => '0.08',

diff --git a/lib/MooseX/Types/DateTime.pm b/lib/MooseX/Types/DateTime.pm
index 0ced3ad..d8fc652 100644 (file)
--- a/lib/MooseX/Types/DateTime.pm
+++ b/lib/MooseX/Types/DateTime.pm
@@ -186,6 +186,10 @@ Delegates to L<DateTime::TimeZone/new> with the string as the C<name> argument.
 
 =back
 
+=back
+
+=back
+
 =head1 SEE ALSO
 
 L<MooseX::Types::DateTimeX>
@@ -194,8 +198,8 @@ L<DateTime>, L<DateTimeX::Easy>
 
 =head1 VERSION CONTROL
 
-L<http://code2.0beta.co.uk/moose/svn/MooseX-Types-DateTime/trunk>. Ask on
-#moose for commit bits.
+This module is maintained using git. You can get the latest version from
+L<git://github.com/nothingmuch/moosex-types-datetime.git>.
 
 =head1 AUTHOR