revert inadvertent upstream changes

diff --git a/Changes b/Changes
index 5bed277d155f640b692762bf4604b066aed9b2a9..d765845ec063bb8e254337f1353e2b4713e0be80 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,24 @@
 Revision history for HTML-CalendarMonth
 
+2.04  Fri Apr 15 13:08:28 EDT 2016
+        - *really* fixed version check for DateTime::Locale 1.03
+
+2.03  Wed Apr 13 15:25:20 EDT 2016
+        - Updated tests to work with DateTime::Locale 1.03
+          based on CLDR 29
+
+2.02  Tue Nov 17 16:18:40 EST 2015
+        - Adjusted version cutoff for legacy locale tests
+
+2.01  Tue Nov 17 14:26:35 EST 2015
+        - fixed minor bug with undefined 'today' attribute
+
+2.00  Tue Nov 17 13:48:44 EST 2015
+        - Updated for compatibility with DateTime::Locale
+          versions 0.90 and greater. Backwards compatibility
+          retained.
+        - updated tests
+
 1.26  Fri Aug 26 15:08:49 EDT 2011
         - fixed css/header interactions
         - updated tests

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
deleted file mode 100644 (file)
index 8d5c2de..0000000
--- a/MANIFEST.SKIP
+++ /dev/null
@@ -1,4 +0,0 @@
-\.pl$
-\.out$
-\.old$
-\.bak$

diff --git a/bs.pm b/bs.pm
deleted file mode 100644 (file)
index e97acbe..0000000
--- a/bs.pm
+++ /dev/null
@@ -1,23 +0,0 @@
-package bs;
-
-use Moose;
-with 'Dist::Zilla::Role::VersionProvider';
-with 'Dist::Zilla::Role::ModuleInfo';
-
-sub provide_version {
-  my ($self) = @_;
-
-  my $main_module = $self->zilla->main_module;
-  my $module = $main_module->name;
-
-  my $pm_info = $self->get_module_info($main_module);
-  my $ver     = $pm_info->version;
-
-  die "Unable to get version from $module" unless defined $ver;
-
-  $self->log("dist version $ver (from $module)");
-
-  "$ver";
-}
-
-1;

diff --git a/dist.ini b/dist.ini
deleted file mode 100644 (file)
index c4d6cf1..0000000
--- a/dist.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-name             = HTML-CalendarMonth
-version          = 1.26
-author           = Matthew P. Sisk <msisk@cpan.org>
-license          = Perl_5
-copyright_holder = Matthew Sisk
-
-[NextRelease]
-format =  %-5v %{eee LLL dd HH:MM:ss zzz yyyy}d
-
-[@Git]
-
-[GatherDir]
-[ManifestSkip]
-[PruneCruft]
-[MetaJSON]
-[MakeMaker]
-[License]
-
-[ExtraTests]
-[CriticTests]
-[PodSyntaxTests]
-[PodCoverageTests]
-
-[PkgVersion]
-
-[AutoPrereqs]
-skip = ^testload|Date::Calc|Date::Manip|DateTime$
-
-[Manifest]
-
-[TestRelease]
-[ConfirmRelease]
-[UploadToCPAN]

diff --git a/lib/HTML/CalendarMonth/DateTool.pm b/lib/HTML/CalendarMonth/DateTool.pm
index e69328dbea19d42c932c7b84e83e7b9028a283f8..702a30fcd5c75947a451b5636816ad44dbb7e0a5 100644 (file)
--- a/lib/HTML/CalendarMonth/DateTool.pm
+++ b/lib/HTML/CalendarMonth/DateTool.pm
@@ -450,11 +450,7 @@ methods are necessary:
 
 For a given day, and optionally C<month> and C<year> if they are
 different from those specified in C<new()>, provide the day of week
-<<<<<<< HEAD
-number. (1=Sunday, 7=Saturday).
-=======
 number. (0=Sunday, 6=Saturday).
->>>>>>> upstream/2.04
 
 =item add_days($days, $delta, $day, [$month], [$year])
 

diff --git a/t/author-critic.t b/t/author-critic.t
deleted file mode 100644 (file)
index af7f7ea..0000000
--- a/t/author-critic.t
+++ /dev/null
@@ -1,20 +0,0 @@
-#!perl
-
-BEGIN {
-  unless ($ENV{AUTHOR_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for testing by the author');
-  }
-}
-
-
-use strict;
-use warnings;
-
-use Test::More;
-use English qw(-no_match_vars);
-
-eval "use Test::Perl::Critic";
-plan skip_all => 'Test::Perl::Critic required to criticise code' if $@;
-Test::Perl::Critic->import( -profile => "perlcritic.rc" ) if -e "perlcritic.rc";
-all_critic_ok();

diff --git a/t/release-pod-coverage.t b/t/release-pod-coverage.t
deleted file mode 100644 (file)
index 3a81849..0000000
--- a/t/release-pod-coverage.t
+++ /dev/null
@@ -1,21 +0,0 @@
-#!perl
-
-BEGIN {
-  unless ($ENV{RELEASE_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for release candidate testing');
-  }
-}
-
-
-use Test::More;
-
-eval "use Test::Pod::Coverage 1.08";
-plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage"
-  if $@;
-
-eval "use Pod::Coverage::TrustPod";
-plan skip_all => "Pod::Coverage::TrustPod required for testing POD coverage"
-  if $@;
-
-all_pod_coverage_ok({ coverage_class => 'Pod::Coverage::TrustPod' });

diff --git a/t/release-pod-syntax.t b/t/release-pod-syntax.t
deleted file mode 100644 (file)
index d46a955..0000000
--- a/t/release-pod-syntax.t
+++ /dev/null
@@ -1,15 +0,0 @@
-#!perl
-
-BEGIN {
-  unless ($ENV{RELEASE_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for release candidate testing');
-  }
-}
-
-use Test::More;
-
-eval "use Test::Pod 1.41";
-plan skip_all => "Test::Pod 1.41 required for testing POD" if $@;
-
-all_pod_files_ok();