From owner-svn-src-head@FreeBSD.ORG Tue Mar 30 21:11:17 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E6DD1065673; Tue, 30 Mar 2010 21:11:17 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E7C7C8FC1F; Tue, 30 Mar 2010 21:11:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2ULBGDW096415; Tue, 30 Mar 2010 21:11:16 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2ULBGr6096413; Tue, 30 Mar 2010 21:11:16 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201003302111.o2ULBGr6096413@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 30 Mar 2010 21:11:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205937 - head/usr.bin/calendar/calendars X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Mar 2010 21:11:17 -0000 Author: edwin Date: Tue Mar 30 21:11:16 2010 New Revision: 205937 URL: http://svn.freebsd.org/changeset/base/205937 Log: For where possible, make the dates of the Tasmanian holidays properly variable. The leftover ones are the Thursday before the Fourth Saturday of October (Oct/SatFourth-2) which is not possible yet. Modified: head/usr.bin/calendar/calendars/calendar.australia Modified: head/usr.bin/calendar/calendars/calendar.australia ============================================================================== --- head/usr.bin/calendar/calendars/calendar.australia Tue Mar 30 20:46:10 2010 (r205936) +++ head/usr.bin/calendar/calendars/calendar.australia Tue Mar 30 21:11:16 2010 (r205937) @@ -26,13 +26,27 @@ Oct/MonFirst Labour Day (ACT, NSW, SA) Mar/MonSecond Labour Day (VIC) Nov/TueFirst Melbourne Cup (VIC) -/* Tasmania */ -Feb 11 Regatta Day (TAS) -Feb 27 Launceston Cup (TAS) -Mar 11 Eight Hours Day (TAS) -Oct 10 Launceston Show Day (TAS) -Oct 24 Hobart Show Day (TAS) -Nov 04 Recreation Day (N TAS) +/* Tasmania + * http://www.wst.tas.gov.au/employment_info/public_holidays/html/2010 + */ +Feb/MonSecond Regatta Day (TAS) +Feb/WedLast Launceston Cup (TAS) +Mar/TueFirst King Island show (TAS) +Mar/MonSecond Eight Hours Day (TAS) +Oct 10 Launceston Show Day (TAS) /* Thursday preceding second Saturday in October */ +Oct 24 Hobart Show Day (TAS) /* Thursday preceding fourth Saturday in October */ +Nov/MonFirst Recreation Day (N TAS) + +/* +Oct/SatSecond-2 Launceston Show Day (TAS) // Thursday preceding second Sat in October +Oct/SatFourth-2 Hobart Show Day (TAS) // Thursday preceding fourth Sat in October +May/ThuFirst+1 Agfest (Circular Head only) // Friday following the first Thursday in May +Oct/SatFirst-1 Burnie Show // Friday preceding first Saturday in October +Oct/SatThird-1 Flinders Island Show // Friday preceding third Saturday in October + +DEVONPORT CUP Wednesday not earlier than fifth and not later than eleventh day of January +DEVONPORT SHOW Friday nearest last day in November, but not later than first day of December +*/ /* South Australia */ May/MonThird Adelaide Cup (SA) @@ -53,6 +67,6 @@ Aug/MonFirst Picnic Day (NT) /* Queensland */ May/MonFirst Labour Day (QLD) -Aug 14 RNA Show Day (Brisbane metro) +Aug/WedSecond RNA Show Day (Brisbane metro) /* Second Last Wednesday */ #endif