From thierry@pompo.net  Thu Mar 31 22:19:58 2005
Return-Path: <thierry@pompo.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3526116A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 31 Mar 2005 22:19:58 +0000 (GMT)
Received: from graf.pompo.net (graf.pompo.net [81.56.186.139])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5AED743D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 31 Mar 2005 22:19:57 +0000 (GMT)
	(envelope-from thierry@pompo.net)
Received: by graf.pompo.net (Postfix, from userid 1001)
	id 7EA89763A; Fri,  1 Apr 2005 00:19:04 +0200 (CEST)
Message-Id: <20050331221904.7EA89763A@graf.pompo.net>
Date: Fri,  1 Apr 2005 00:19:04 +0200 (CEST)
From: Thierry Thomas <thierry@pompo.net>
Reply-To: Thierry Thomas <thierry@pompo.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Fix "Mothers Day" in calendar.french.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         79415
>Category:       conf
>Synopsis:       Fix "Mothers Day" in calendar.french.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    flz
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 31 22:20:02 GMT 2005
>Closed-Date:    Sat Oct 07 15:26:33 GMT 2006
>Last-Modified:  Sat Oct  7 15:30:36 GMT 2006
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.11-STABLE FreeBSD 4.11-STABLE #0: Sun Jan 30 13:45:16 CET 2005 thierry@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	- fix dates of Mothers Day and Fathers Day in calendar.jferies;

	- since I'm there, add a missing common firstname in calendar.fetes.

	Remark: in France, Mothers Day is the last sunday of May, unless it is
	also Easter+49, but I don't know how to write this rule.

>How-To-Repeat:
	`calendar -t 29.05.2005' should report "Fetes des meres".

>Fix:
	Please apply the following patches:

--- calendar.jferies.diff begins here ---
--- src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies.orig	Mon Apr 29 22:57:36 2002
+++ src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies	Thu Mar 31 23:54:38 2005
@@ -39,7 +39,8 @@
 10/SundayLast	Passage  l'heure d'hiver
 
 /* Divers */
-May Sun+2 	Ftes des mres
-June Sun+2	Ftes des pres
+/* BUG: si Pentecte = 05/SunLast, fte des mres repousse d'une semaine */
+05/SundayLast 	Ftes des mres
+June Sun+3	Ftes des pres
 
 #endif /*! _fr_FR_ISO8859_1_jferies_ */
--- calendar.jferies.diff ends here ---

--- calendar.fetes.diff begins here ---
--- src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes.orig	Mon Apr 29 22:57:36 2002
+++ src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes	Fri Apr  1 00:00:01 2005
@@ -124,7 +124,7 @@
 02/15	Bonne fte aux Georgette !
 02/16	Aujourd'hui, c'est la St(e) Julienne.
 02/17	N'oubliez pas les Alexis !
-02/18	Bonne fte aux Bernadette !
+02/18	Bonne fte aux Bernadette et aux Nadine !
 02/19	Aujourd'hui, c'est la St(e) Gabin.
 02/20	N'oubliez pas les Aime !
 02/20	Bonne fte aux Aim !
--- calendar.fetes.diff ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: flz 
State-Changed-When: Thu Apr 13 12:15:02 UTC 2006 
State-Changed-Why:  
Committed to HEAD, MFC planned in one (or two) weeks, once RELENG_6 is 
thawed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79415 
Responsible-Changed-From-To: freebsd-bugs->flz 
Responsible-Changed-By: flz 
Responsible-Changed-When: Fri Oct 6 23:32:28 UTC 2006 
Responsible-Changed-Why:  
That's what happens when you don't take a PR you just committed. 

You're supposed to MFC after the end of the freeze, you forget 
about it, and when you finally find it again, the tree is 
frozen again. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79415 
State-Changed-From-To: patched->closed 
State-Changed-By: flz 
State-Changed-When: Sat Oct 7 15:26:13 UTC 2006 
State-Changed-Why:  
MFC'ed to RELENG_6. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=79415 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/79415: commit references a PR
Date: Sat,  7 Oct 2006 15:25:53 +0000 (UTC)

 flz         2006-10-07 15:25:38 UTC
 
   FreeBSD src repository
 
   Modified files:        (Branch: RELENG_6)
     usr.bin/calendar/calendars/fr_FR.ISO8859-1 calendar.fetes 
                                                calendar.jferies 
   Log:
   MFC: Fix Mother's/Father's day in most case.
   
         src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies: rev 1.1 -> 1.2
         src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes: rev 1.1 -> 1.2
   
   PR:             misc/79415
   Submitted by:   thierry
   Approved by:    re (bmah)
   
   Revision  Changes    Path
   1.1.16.1  +1 -1      src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes
   1.1.16.1  +3 -2      src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
