]> git.donarmstrong.com Git - deb_pkgs/libhtml-calendarmonth-perl.git/commitdiff
Merge tag 'upstream/2.04'
authorDon Armstrong <don@donarmstrong.com>
Tue, 21 Jun 2016 03:31:42 +0000 (20:31 -0700)
committerDon Armstrong <don@donarmstrong.com>
Tue, 21 Jun 2016 03:31:42 +0000 (20:31 -0700)
Upstream version 2.04

15 files changed:
Changes
MANIFEST.SKIP [new file with mode: 0644]
bs.pm [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/watch [new file with mode: 0644]
dist.ini [new file with mode: 0644]
lib/HTML/CalendarMonth/DateTool.pm
t/author-critic.t [new file with mode: 0644]
t/release-pod-coverage.t [new file with mode: 0644]
t/release-pod-syntax.t [new file with mode: 0644]

diff --git a/Changes b/Changes
index d765845ec063bb8e254337f1353e2b4713e0be80..5bed277d155f640b692762bf4604b066aed9b2a9 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,24 +1,5 @@
 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
new file mode 100644 (file)
index 0000000..8d5c2de
--- /dev/null
@@ -0,0 +1,4 @@
+\.pl$
+\.out$
+\.old$
+\.bak$
diff --git a/bs.pm b/bs.pm
new file mode 100644 (file)
index 0000000..e97acbe
--- /dev/null
+++ b/bs.pm
@@ -0,0 +1,23 @@
+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/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..ca4dbb2
--- /dev/null
@@ -0,0 +1,84 @@
+libhtml-calendarmonth-perl (1.26-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Don Armstrong <don@debian.org>  Thu, 22 Sep 2011 14:23:16 -0700
+
+libhtml-calendarmonth-perl (1.25-1) unstable; urgency=low
+
+  * New upstream release
+    - Handle upstream changes in HTML::Tree to avoid test failures
+    (closes: #613391); thanks to Matt Kraai for pointing out the
+    patch.
+
+ -- Don Armstrong <don@debian.org>  Wed, 16 Feb 2011 19:40:20 -0800
+
+libhtml-calendarmonth-perl (1.19-2) unstable; urgency=low
+
+  * Fix FTBFS caused by new version of Date::Manip (closes: 571421)
+  * Bumb standards version; no changes needed
+  * Require debhelper 7
+  * Fix some minor POD errors
+
+ -- Don Armstrong <don@debian.org>  Fri, 26 Feb 2010 13:08:35 -0800
+
+libhtml-calendarmonth-perl (1.19-1) unstable; urgency=low
+
+  * New upstream release
+  * Update standards version; no changes necessary
+  * Clean up binary-arch: target
+
+ -- Don Armstrong <don@debian.org>  Thu, 19 Jun 2008 12:16:15 -0700
+
+libhtml-calendarmonth-perl (1.18-4) unstable; urgency=low
+
+  * Handle a non-existent /usr/lib/perl5 properly (for perl 5.10)
+
+ -- Don Armstrong <don@debian.org>  Wed, 16 Jan 2008 15:10:39 -0800
+
+libhtml-calendarmonth-perl (1.18-3) unstable; urgency=low
+
+  * Disable the 20_i18n test of the basque locale which has been broken by
+    a buggy basque locale in DateTime::Locale (#453368), causing us to
+    FTBFS (closes: #453225)
+
+ -- Don Armstrong <don@debian.org>  Wed, 28 Nov 2007 21:21:39 -0800
+
+libhtml-calendarmonth-perl (1.18-2) unstable; urgency=low
+
+  * Fix test comparsion to handle changes in HTML::Table (closes: #420048)
+  * Add missing = in HTML::CalenderMonth pod (closes: #394126)
+
+ -- Don Armstrong <don@debian.org>  Mon, 23 Apr 2007 17:51:26 -0700
+
+libhtml-calendarmonth-perl (1.18-1) unstable; urgency=low
+
+  * New upstream release
+  * Change priority to extra as it should have been originally
+
+ -- Don Armstrong <don@debian.org>  Tue, 28 Feb 2006 20:26:10 -0800
+
+libhtml-calendarmonth-perl (1.17-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Don Armstrong <don@debian.org>  Mon,  6 Feb 2006 17:59:11 -0800
+
+libhtml-calendarmonth-perl (1.16-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Don Armstrong <don@debian.org>  Wed,  4 Jan 2006 16:23:00 -0800
+
+libhtml-calendarmonth-perl (1.15-1) unstable; urgency=low
+
+  * New upstream release (Closes: #329554)
+  * patch lib/HTML/CalendarMonth.pm to fix the useless use of + in void context warning
+
+ -- Don Armstrong <don@debian.org>  Sun, 25 Sep 2005 03:35:12 -0700
+
+libhtml-calendarmonth-perl (1.09-1) unstable; urgency=low 
+
+  * First Packaging (Closes: #150121).
+
+ -- Don Armstrong <don@donarmstrong.com>  Mon, 10 Jun 2002 21:53:52  -0700
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..8bbd5c8
--- /dev/null
@@ -0,0 +1,17 @@
+Source: libhtml-calendarmonth-perl
+Section: perl
+Priority: extra
+Standards-Version: 3.9.2
+Maintainer: Don Armstrong <don@debian.org>
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: libhtml-element-extended-perl (>=1.18-0), libdatetime-locale-perl, libclass-accessor-perl, libdate-calc-perl, libdate-manip-perl, libdatetime-perl, libfile-which-perl
+
+Package: libhtml-calendarmonth-perl
+Architecture: all
+Depends: ${perl:Depends}, ${misc:Depends}, libhtml-element-extended-perl (>=1.18-0), libdatetime-locale-perl, libdate-calc-perl|libdate-manip-perl|libdatetime-perl, libclass-accessor-perl, libfile-which-perl
+Description: generate and manipulate calandar months in HTML
+ This module enables you to generate and manipulate calendar
+ months in HTML.
+ .
+ Useful for making calendars to display in web pages and other similar
+ tasks.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..b4cf7d6
--- /dev/null
@@ -0,0 +1,11 @@
+Author: Mathew P. Sisk <sisk@mojotoad.com>
+Webpage: http://www.mojotoad.com/sisk/projects/HTML-CalendarMonth/
+Download: http://www.cpan.org/authors/id/M/MS/MSISK/HTML-CalendarMonth-1.15.tar.gz
+Debianized: Don Armstrong <don@debian.org> Sun, 23 Jun 2002 01:47:35 -0700
+            svn://svn.donarmstrong.com/deb_pkgs/libhtml-calendarmonth-perl
+
+Copyright: Copyright (c) 1999-2002 Matthew P. Sisk.  All rights
+reserved.  All wrongs revenged. This program is free software; you can
+redistribute it and/or modify it under the same terms as Perl itself.
+
+License: GPL, Artistic, available at /usr/share/common-licenses/{GPL,Artistic}
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..88a6d42
--- /dev/null
@@ -0,0 +1,68 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DESTDIR=$(CURDIR)/debian/$(shell dh_listpackages|head -n 1)
+
+build-arch: build
+build-indep: build
+
+build: build-stamp
+build-stamp:
+       dh_testdir
+
+       perl Makefile.PL INSTALLDIRS=vendor
+       $(MAKE)
+
+       touch $@
+
+test: test-stamp
+test-stamp:
+       dh_testdir
+       $(MAKE) test
+       touch $@
+
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp test-stamp
+
+       if [ -e Makefile ]; then $(MAKE) distclean; fi
+
+       dh_clean
+
+install: build test
+       dh_testdir
+       dh_testroot
+       dh_prep
+       dh_installdirs
+
+       $(MAKE) install PREFIX=$(DESTDIR)/usr
+       [ ! -d $(DESTDIR)/usr/lib/perl5 ] || \
+               rmdir -p --ignore-fail-on-non-empty $(DESTDIR)/usr/lib/perl5
+
+# Build architecture-independent files here.
+binary-indep: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs
+       dh_installdocs
+       dh_installexamples
+       dh_installman
+       dh_link
+       dh_compress
+       dh_fixperms
+       dh_installdeb
+       dh_perl
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: 
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..9f8e9b6
--- /dev/null
@@ -0,0 +1 @@
+1.0
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..2cdbe9b
--- /dev/null
@@ -0,0 +1,3 @@
+# format version number, currently 2; this line is compulsory!
+version=2
+http://www.perl.com/CPAN/authors/id/M/MS/MSISK/HTML-CalendarMonth-([\d\.]+).tar.gz
diff --git a/dist.ini b/dist.ini
new file mode 100644 (file)
index 0000000..c4d6cf1
--- /dev/null
+++ b/dist.ini
@@ -0,0 +1,33 @@
+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]
index 702a30fcd5c75947a451b5636816ad44dbb7e0a5..e69328dbea19d42c932c7b84e83e7b9028a283f8 100644 (file)
@@ -450,7 +450,11 @@ 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
new file mode 100644 (file)
index 0000000..af7f7ea
--- /dev/null
@@ -0,0 +1,20 @@
+#!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
new file mode 100644 (file)
index 0000000..3a81849
--- /dev/null
@@ -0,0 +1,21 @@
+#!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
new file mode 100644 (file)
index 0000000..d46a955
--- /dev/null
@@ -0,0 +1,15 @@
+#!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();