Bug#987372: buster-pu: package distro-info-data/0.41+deb10u3 OR (distro-info/1.0~deb10u1 AND distro-info-data/0.47~deb10u1)
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 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.0 -0800
+++ distro-info-data-0.41+deb10u4/debian/changelog 2021-09-17
15:30:21.0 -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 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.csv2020-11-02 12:44:14.0
-0800
+++ distro-info-data-0.41+deb10u4/debian.csv2021-09-17 15:30:21.0
-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.csv2020-11-02 12:44:14.0
-0800
+++ distro-info-data-0.41+deb10u4/ubuntu.csv2021-09-17 15:30:21.0
-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.0 -0800
+++ distro-info-data-0.41+deb10u4/validate-csv-data 2021-09-17
15:30:21.0 -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
Bug#987372: buster-pu: package distro-info-data/0.41+deb10u3 OR (distro-info/1.0~deb10u1 AND distro-info-data/0.47~deb10u1)
Package: release.debian.org Severity: normal Tags: buster User: release.debian@packages.debian.org Usertags: pu X-Debbugs-Cc: bdr...@debian.org There's a new Ubuntu release, so it's time to upload a distro-info-data update for buster. I missed 0.46, but there was nothing urgent in it. The changes in unstable since the last update are: distro-info-data (0.47) unstable; urgency=medium * Add Ubuntu 21.04, Impish Indri. -- Stefano Rivera Thu, 22 Apr 2021 10:30:18 -0400 distro-info-data (0.46) unstable; urgency=medium * Add "eol-server" dates matching "eol", for LTS releases, as there hasn't been a distinction between the two, for a while. (Closes: #922090, LP: #1814976). * Add "eol-esm" column: EOL for Ubuntu Extended Security Maintenance support. (LP: #1808038) * Drop ancient Replaces: distro-info (<< 0.3~). No longer needed. * Add "eol-lts" for Debian LTS (Closes: #782685) * Add estimated dates for Buster EOL and Buster LTS EOL. * Publish the data to GitLab pages. (Closes: #973904) * Bump Standards-Version to 4.5.1, no changes needed. * Bump copyright years. * Correct the EOL date for Debian Jessie. * Add Debian 13 "Trixie", with a rough date. * Add "up-to-date" testing tool. * Add an autopkgtest, running the validation and up-to-date tests. * "black" Python. * Add "eol-elts" for Debian ELTS. * Tweak eol and eol-esm dates, by a couple of days, for Ubuntu 6.10, 9.10, 10.04, 12.04, 15.04, 15.10, 19.04 to match announced EOL dates. -- Stefano Rivera Fri, 29 Jan 2021 13:41:20 -0700 [ Reason ] I want to update distro-info-data, so that it knows about the current Ubuntu development release, and future Debian releases. [ Impact ] Currently on a Buster system: $ ubuntu-distro-info --devel 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. With this change: $ ubuntu-distro-info --devel impish [ Tests ] distro-info-data is just a data package. There are automated tests for correctness and freshness. distro-info has automated unit and integration tests. [ Risks ] The intention for distro-info and distro-info-data was that the data could always be trivially backported to stable releases, however this time there are a few changes there that make this a non-trivial update. They got batched together, because once you're breaking the world, you may as well do it properly: 1. New columns. distro-info didn't support unknown columns in the CSV data until 1.0. 2. Date corrections. distro-info used historical dates in the test suite, so changes break build time tests and autopkgtests. So, I offer you two choices: 1. We backport distro-info-data 0.47 and distro-info 1.0 to buster. Bringing new features, and simplified unmodified backport data updates in the future. * distro-info_1.0~deb10u1.debdiff * distro-info-data_0.47~deb10u1.debdiff 2. We cherry-pick the important changes in distro-info-data (excluding those historical date corrections that break tests, and new columns). Future updates for buster will have to continue to do this. * distro-info-data_0.41+deb10u4.debdiff With the backport approach: Users will need to install 2 updates together: distro-info Depends: distro-info-data (>= 0.46~) distro-info-data Breaks: distro-info (<< 1.0~) Other code that interprets distro-info-data directly may be surprised by new columns. All reverse-dependencies in the archive have been checked, and won't be affected. With the cherry-pick approach: Negligible risk to users, it's a new entry in the Debian & Ubuntu releases tables, and EOL updates for Jessie and Buster (guessed). Future updates will have to continue to cherry-pick, which means they won't be tested as well as straight backports. [ 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 [ Changes ] backport approach: distro-info-data (0.47~deb10u1) buster; urgency=medium * Backport 0.47 to buster. Highlights: - Add "eol-esm" for Ubuntu Extended Security Maintenance support. - Add "eol-lts" for Debian LTS (Closes: #782685) - Add "eol-elts" for Debian ELTS. - Add estimated dates for Buster EOL and Buster LTS EOL. - Add Debian 13 "Trixie", with a rough date. - Correct the EOL date for Debian Jessie. - Tweak eol and eol-esm dates, by a couple of days, for Ubuntu 6.10, 9.10, 10.04, 12.04, 15.04, 15.10, 19.04 to match announced EOL dates. - Add Ubuntu 21.04, Impish Indri. -- Stefano Rivera Thu, 22 Apr 2021 11:46:22 -0400 distro-info-data (0.47) unstable; urgency=medium * Add Ubuntu 21.04, Impish Indri. -- Stefano Rivera Thu, 22 Apr 2021 10:30:18 -0400
