Version in base suite: 0.51+deb11u3 Base version: distro-info-data_0.51+deb11u3 Target version: distro-info-data_0.51+deb11u4 Base file: /srv/ftp-master.debian.org/ftp/pool/main/d/distro-info-data/distro-info-data_0.51+deb11u3.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/d/distro-info-data/distro-info-data_0.51+deb11u4.dsc debian.csv | 5 +++-- debian/changelog | 14 ++++++++++++++ ubuntu.csv | 9 +++++---- validate-csv-data | 25 ++++++++++++++++++++----- 4 files changed, 42 insertions(+), 11 deletions(-) diff -Nru distro-info-data-0.51+deb11u3/debian/changelog distro-info-data-0.51+deb11u4/debian/changelog --- distro-info-data-0.51+deb11u3/debian/changelog 2022-10-30 11:31:55.000000000 +0000 +++ distro-info-data-0.51+deb11u4/debian/changelog 2023-04-29 18:30:57.000000000 +0000 @@ -1,3 +1,17 @@ +distro-info-data (0.51+deb11u4) bullseye; urgency=medium + + * Update data to 0.58: + - Add Debian 14 "forky" with a vague creation date. + - Correct Ubuntu 23.04 release date to 2023-04-20. + - Tighten validate-csv-data heuristics, restricting Ubuntu EoLs to + Tue-Thursday. + - Document Ubuntu ESM overlap period (LP: #2003949) + - Add Ubuntu 23.10 Mantic Minotaur (LP: #2018028) + - Set the planned release date for Debian bookworm (and an EoL based on it). + - Adjust trixie's creation date to match bookworm's release. + + -- Stefano Rivera Sat, 29 Apr 2023 14:30:57 -0400 + distro-info-data (0.51+deb11u3) bullseye; urgency=medium * Update data to 0.55: diff -Nru distro-info-data-0.51+deb11u3/debian.csv distro-info-data-0.51+deb11u4/debian.csv --- distro-info-data-0.51+deb11u3/debian.csv 2022-10-30 11:31:55.000000000 +0000 +++ distro-info-data-0.51+deb11u4/debian.csv 2023-04-29 18:30:57.000000000 +0000 @@ -15,7 +15,8 @@ 9,Stretch,stretch,2015-04-26,2017-06-17,2020-07-06,2022-06-30,2027-06-30 10,Buster,buster,2017-06-17,2019-07-06,2022-08-14,2024-06-30,2029-06-30 11,Bullseye,bullseye,2019-07-06,2021-08-14,2024-08-14 -12,Bookworm,bookworm,2021-08-14 -13,Trixie,trixie,2023-08-01 +12,Bookworm,bookworm,2021-08-14,2023-06-10,2026-06-10 +13,Trixie,trixie,2023-06-10 +14,Forky,forky,2025-08-01 ,Sid,sid,1993-08-16 ,Experimental,experimental,1993-08-16 diff -Nru distro-info-data-0.51+deb11u3/ubuntu.csv distro-info-data-0.51+deb11u4/ubuntu.csv --- distro-info-data-0.51+deb11u3/ubuntu.csv 2022-10-30 11:31:55.000000000 +0000 +++ distro-info-data-0.51+deb11u4/ubuntu.csv 2023-04-29 18:30:57.000000000 +0000 @@ -26,14 +26,15 @@ 16.10,Yakkety Yak,yakkety,2016-04-21,2016-10-13,2017-07-20 17.04,Zesty Zapus,zesty,2016-10-13,2017-04-13,2018-01-13 17.10,Artful Aardvark,artful,2017-04-13,2017-10-19,2018-07-19 -18.04 LTS,Bionic Beaver,bionic,2017-10-19,2018-04-26,2023-04-26,2023-04-26,2028-04-26 +18.04 LTS,Bionic Beaver,bionic,2017-10-19,2018-04-26,2023-05-31,2023-05-31,2028-04-26 18.10,Cosmic Cuttlefish,cosmic,2018-04-26,2018-10-18,2019-07-18 19.04,Disco Dingo,disco,2018-10-18,2019-04-18,2020-01-23 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,2025-04-23,2030-04-23 +20.04 LTS,Focal Fossa,focal,2019-10-17,2020-04-23,2025-05-29,2025-05-29,2030-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-20 21.10,Impish Indri,impish,2021-04-22,2021-10-14,2022-07-14 -22.04 LTS,Jammy Jellyfish,jammy,2021-10-14,2022-04-21,2027-04-21,2027-04-21,2032-04-21 +22.04 LTS,Jammy Jellyfish,jammy,2021-10-14,2022-04-21,2027-06-01,2027-06-01,2032-04-21 22.10,Kinetic Kudu,kinetic,2022-04-21,2022-10-20,2023-07-20 -23.04,Lunar Lobster,lunar,2022-10-20,2023-04-27,2024-01-25 +23.04,Lunar Lobster,lunar,2022-10-20,2023-04-20,2024-01-25 +23.10,Mantic Minotaur,mantic,2023-04-20,2023-10-12,2024-07-11 diff -Nru distro-info-data-0.51+deb11u3/validate-csv-data distro-info-data-0.51+deb11u4/validate-csv-data --- distro-info-data-0.51+deb11u3/validate-csv-data 2022-10-30 11:31:55.000000000 +0000 +++ distro-info-data-0.51+deb11u4/validate-csv-data 2023-04-29 18:30:57.000000000 +0000 @@ -21,7 +21,7 @@ import csv import sys -from datetime import date +from datetime import date, timedelta from lib.tools import convert_date, main @@ -150,10 +150,25 @@ 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) + if eol_date >= date(2021, 1, 1): + if eol_date.weekday() == 0 or eol_date.weekday() >= 4: + msg = ( + f"{column} for {row['codename']}" + f" lands outside Tuesday-Thursday ({eol_date})" + ) + error(filename, csvreader.line_num, msg) + failures += 1 + if row["version"].endswith("LTS") and row["release"] >= date(2018, 1, 1): + eol_date = row["eol"] + assert eol_date == row["eol-server"] + june = eol_date.replace(day=1, month=6) + if june - eol_date > timedelta(days=7): + msg = ( + f"eol for {row['codename']}" + f" is missing ESM overlap period ({eol_date})" + ) + error(filename, csvreader.line_num, msg) + failures += 1 return failures == 0