Hi SRMs (2021.04.22_09:57:49_-0700)
Given the lack of reply here, let's stick with the minimal option.
There have been more changes since the last patch, so here's an updated
debdiff. Uploaded to buster-proposed-updates.
> [ Checklist ]
> [x] *all* changes are documented in the d/changelog
> [x] I reviewed all changes and I approve them
> [x] attach debdiff against the package in stable
> [x] the issue is verified as fixed in unstable
Still true.
Changes:
distro-info-data (0.41+deb10u4) buster; urgency=medium
* Update data to 0.51, without new columns:
- Add estimated date for Buster EOL.
- Correct the EOL date for Debian Jessie.
- Add Debian 13 "Trixie", with a rough date.
- Add Ubuntu 21.10, Impish Indri.
- Move Ubuntu EoLs off weekends.
- Validate that Ubuntu EoLs occur during the week.
- Set bullseye's release date, bookworm's creation date, and buster's EoL
date based on the updated planned bullseye release date.
-- Stefano Rivera <stefa...@debian.org> Fri, 17 Sep 2021 15:30:21 -0700
SR
--
Stefano Rivera
http://tumbleweed.org.za/
+1 415 683 3272
diff -Nru distro-info-data-0.41+deb10u3/debian/changelog
distro-info-data-0.41+deb10u4/debian/changelog
--- distro-info-data-0.41+deb10u3/debian/changelog 2020-11-02
12:44:14.000000000 -0800
+++ distro-info-data-0.41+deb10u4/debian/changelog 2021-09-17
15:30:21.000000000 -0700
@@ -1,3 +1,17 @@
+distro-info-data (0.41+deb10u4) buster; urgency=medium
+
+ * Update data to 0.51, without new columns:
+ - Add estimated date for Buster EOL.
+ - Correct the EOL date for Debian Jessie.
+ - Add Debian 13 "Trixie", with a rough date.
+ - Add Ubuntu 21.10, Impish Indri.
+ - Move Ubuntu EoLs off weekends.
+ - Validate that Ubuntu EoLs occur during the week.
+ - Set bullseye's release date, bookworm's creation date, and buster's EoL
+ date based on the updated planned bullseye release date.
+
+ -- Stefano Rivera <stefa...@debian.org> Fri, 17 Sep 2021 15:30:21 -0700
+
distro-info-data (0.41+deb10u3) buster; urgency=medium
* Update data to 0.45:
diff -Nru distro-info-data-0.41+deb10u3/debian.csv
distro-info-data-0.41+deb10u4/debian.csv
--- distro-info-data-0.41+deb10u3/debian.csv 2020-11-02 12:44:14.000000000
-0800
+++ distro-info-data-0.41+deb10u4/debian.csv 2021-09-17 15:30:21.000000000
-0700
@@ -11,10 +11,11 @@
5.0,Lenny,lenny,2007-04-08,2009-02-14,2012-02-06
6.0,Squeeze,squeeze,2009-02-14,2011-02-06,2014-05-31
7,Wheezy,wheezy,2011-02-06,2013-05-04,2016-04-26
-8,Jessie,jessie,2013-05-04,2015-04-25,2018-06-06
+8,Jessie,jessie,2013-05-04,2015-04-25,2018-06-17
9,Stretch,stretch,2015-04-25,2017-06-17,2020-07-06
-10,Buster,buster,2017-06-17,2019-07-06
-11,Bullseye,bullseye,2019-07-06
-12,Bookworm,bookworm,2021-08-01
+10,Buster,buster,2017-06-17,2019-07-06,2022-08-14
+11,Bullseye,bullseye,2019-07-06,2021-08-14,2024-08-14
+12,Bookworm,bookworm,2021-08-14
+13,Trixie,trixie,2023-08-01
,Sid,sid,1993-08-16
,Experimental,experimental,1993-08-16
diff -Nru distro-info-data-0.41+deb10u3/ubuntu.csv
distro-info-data-0.41+deb10u4/ubuntu.csv
--- distro-info-data-0.41+deb10u3/ubuntu.csv 2020-11-02 12:44:14.000000000
-0800
+++ distro-info-data-0.41+deb10u4/ubuntu.csv 2021-09-17 15:30:21.000000000
-0700
@@ -32,4 +32,5 @@
19.10,Eoan Ermine,eoan,2019-04-18,2019-10-17,2020-07-17
20.04 LTS,Focal Fossa,focal,2019-10-17,2020-04-23,2025-04-23
20.10,Groovy Gorilla,groovy,2020-04-23,2020-10-22,2021-07-22
-21.04,Hirsute Hippo,hirsute,2020-10-22,2021-04-22,2022-01-22
+21.04,Hirsute Hippo,hirsute,2020-10-22,2021-04-22,2022-01-20
+21.10,Impish Indri,impish,2021-04-22,2021-10-14,2022-07-14
diff -Nru distro-info-data-0.41+deb10u3/validate-csv-data
distro-info-data-0.41+deb10u4/validate-csv-data
--- distro-info-data-0.41+deb10u3/validate-csv-data 2020-11-02
12:44:14.000000000 -0800
+++ distro-info-data-0.41+deb10u4/validate-csv-data 2021-09-17
15:30:21.000000000 -0700
@@ -21,6 +21,7 @@
import optparse
import os
import sys
+from datetime import date
_COLUMNS = {
"debian": ("version", "codename", "series", "created", "release", "eol"),
@@ -121,6 +122,17 @@
"to the given date in column `%s'")
error(filename, csvreader.line_num, msg, date1, date2)
failures += 1
+ # Check that Ubuntu EOL lands on a weekday
+ if distro == 'ubuntu':
+ for column, eol_date in row.items():
+ if not column.startswith('eol'):
+ continue
+ if not eol_date:
+ continue
+ if eol_date.weekday() > 5 and eol_date >= date(2021, 1, 1):
+ msg = '%s for %s lands on a weekend (%s)'
+ error(filename, csvreader.line_num, msg, column,
+ row['codename'], date)
return failures == 0
