[xml/sgml-commit] r317 - in packages/libxslt/trunk: debian libexslt

[Mike Hommey]

Author: glandium-guest
Date: 2004-11-07 08:44:18 -0700 (Sun, 07 Nov 2004)
New Revision: 317

Modified:
   packages/libxslt/trunk/debian/changelog
   packages/libxslt/trunk/libexslt/date.c
Log:
libexslt/date.c: Fixes for date:{day-of|}week-in-month functions.


Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog	2004-11-07 15:20:32 UTC (rev 316)
+++ packages/libxslt/trunk/debian/changelog	2004-11-07 15:44:18 UTC (rev 317)
@@ -4,8 +4,10 @@
     + Build-dep against libxml2 >= 2.6.15. Closes: #280129.
     + Changed libxslt1-python2.3's name to python2.3-libxslt1.
   * debian/libxslt1-python2.3.*: Renamed to python2.3-libxslt1.*.
+  * libexslt/date.c: Fixes for date:{day-of|}week-in-month functions.
+    Closes: #279924, #279926.
 
- -- Mike Hommey <mh@glandium.org>  Mon,  8 Nov 2004 00:17:03 +0900
+ -- Mike Hommey <mh@glandium.org>  Mon,  8 Nov 2004 00:41:05 +0900
 
 libxslt (1.1.12-1) experimental; urgency=low
 

Modified: packages/libxslt/trunk/libexslt/date.c
===================================================================
--- packages/libxslt/trunk/libexslt/date.c	2004-11-07 15:20:32 UTC (rev 316)
+++ packages/libxslt/trunk/libexslt/date.c	2004-11-07 15:44:18 UTC (rev 317)
@@ -2203,7 +2203,7 @@
      */
     fdiw = (_exsltDateDayInWeek(fdiy, dt->value.date.year) + 6) % 7;
 
-    ret = ((dt->value.date.day + fdiw) / 7) + 1;
+    ret = ((dt->value.date.day + fdiw - 1) / 7) + 1;
 
     exsltDateFreeDate(dt);
 
@@ -2348,7 +2348,7 @@
 	}
     }
 
-    ret = (dt->value.date.day / 7) + 1;
+    ret = ((dt->value.date.day - 1) / 7) + 1;
 
     exsltDateFreeDate(dt);