Hello Michael

I'd really like to see this fixed for bullseye. I prepared a merge
request on Salsa:

        https://salsa.debian.org/meskes/bsdmainutils/-/merge_requests/6

It would be great if you could merge and upload.

I can also create an NMU if you don't find the time and agree. Then I'd
apply the attached patch and upload. Please advise.

Best regards
Uwe
diff -Nru bsdmainutils-12.1.7/debian/changelog bsdmainutils-12.1.7+nmu1/debian/changelog
--- bsdmainutils-12.1.7/debian/changelog	2020-08-04 13:49:06.000000000 +0200
+++ bsdmainutils-12.1.7+nmu1/debian/changelog	2021-02-09 09:36:12.000000000 +0100
@@ -1,3 +1,11 @@
+bsdmainutils (12.1.7+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ISO week calculation (Closes: #976192), thanks to Kate for the initial
+    patch.
+
+ -- Uwe Kleine-König <uklei...@debian.org>  Tue, 09 Feb 2021 09:36:12 +0100
+
 bsdmainutils (12.1.7) unstable; urgency=medium
 
   * Fix broken locale for Russian calendars. (Closes: #930736, #945252)
diff -Nru bsdmainutils-12.1.7/debian/patches/ncal_fdow.diff bsdmainutils-12.1.7+nmu1/debian/patches/ncal_fdow.diff
--- bsdmainutils-12.1.7/debian/patches/ncal_fdow.diff	2020-08-04 13:49:06.000000000 +0200
+++ bsdmainutils-12.1.7+nmu1/debian/patches/ncal_fdow.diff	2021-02-09 09:36:12.000000000 +0100
@@ -68,7 +68,7 @@
  static int nswitchb;		/* switch date for backward compatibility */
  static int highlightdate;
 +int weekstart = -1;		/* day the week starts on (Sun [0] - Sat [6]) */
-+int days_first_week = 0;       /* minimal length of the first week in year */
++int days_first_week = -1;       /* minimal length of the first week in year */
  
  static char	*center(char *s, char *t, int w);
  static wchar_t *wcenter(wchar_t *s, wchar_t *t, int w);
@@ -139,7 +139,7 @@
 +#ifdef __GLIBC__
 +		days_first_week = *nl_langinfo(_NL_TIME_WEEK_1STWEEK);
 +#else
-+		days_first_week = 3;
++		days_first_week = 4;
 +#endif
 +
  	if (flag_month != NULL) {

Attachment: signature.asc
Description: PGP signature

Reply via email to