Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: distro-info-d...@packages.debian.org, bdr...@debian.org
Control: affects -1 + src:distro-info-data

As usual, a distro-info-data update.

[ Reason ]
There's a new Ubuntu development release, a bookworm release date, and
some minor Ubuntu EoL changes.

* 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.

[ Impact ]
Debian stable is unaware of the current Ubuntu development release, and
Debian bookworm release dates.

Currently:

$ debian-distro-info -t --date=2023-06-10
bookworm
$ debian-distro-info -s --date=2023-06-10
bullseye
$ ubuntu-distro-info -df
ubuntu-distro-info: Distribution data outdated.
Please check for an update for distro-info-data. See 
/usr/share/doc/distro-info-data/README.Debian for details.

Expected:

$ debian-distro-info -t --date=2023-06-10
trixie
$ debian-distro-info -s --date=2023-06-10
bookworm
$ ubuntu-distro-info -df
Ubuntu 23.10 "Mantic Minotaur"


[ Tests ]
Autopkgtests passed.
The changes include some updates to tests around the Ubuntu EoL dates.

Manually tested as above.

[ Risks ]
Data-only package, this will bring it up to parity with unstable.

[ 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 (old)stable
  [x] the issue is verified as fixed in unstable
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 
07:31:55.000000000 -0400
+++ distro-info-data-0.51+deb11u4/debian/changelog      2023-04-29 
14:30:57.000000000 -0400
@@ -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 <stefa...@debian.org>  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 07:31:55.000000000 
-0400
+++ distro-info-data-0.51+deb11u4/debian.csv    2023-04-29 14:30:57.000000000 
-0400
@@ -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 07:31:55.000000000 
-0400
+++ distro-info-data-0.51+deb11u4/ubuntu.csv    2023-04-29 14:30:57.000000000 
-0400
@@ -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 
07:31:55.000000000 -0400
+++ distro-info-data-0.51+deb11u4/validate-csv-data     2023-04-29 
14:30:57.000000000 -0400
@@ -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
 

Reply via email to