From 75c57df87fcc578536d39d1901679e58edfbee3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Wed, 5 Jun 2024 17:33:15 +0000 Subject: [PATCH] distro-info-data: update data for ecne / noble. --- .../DATA/distro-info-data/README.Debian.patch | 4 ++-- .../distro-info-data/add_trisquel_tools_py.patch | 16 +++++++++------- .../distro-info-data/add_trisquel_validate.patch | 4 ++-- helpers/DATA/distro-info-data/trisquel.csv | 1 + helpers/make-distro-info-data | 8 ++++---- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/helpers/DATA/distro-info-data/README.Debian.patch b/helpers/DATA/distro-info-data/README.Debian.patch index cc2243b..1d647b5 100644 --- a/helpers/DATA/distro-info-data/README.Debian.patch +++ b/helpers/DATA/distro-info-data/README.Debian.patch @@ -1,5 +1,5 @@ ---- debian/README.Debian 2019-10-17 15:10:30.000000000 -0500 -+++ debian/README.Debian_trisquel 2021-11-26 13:26:20.362971709 -0600 +--- a/debian/README.Debian 2019-10-17 15:10:30.000000000 -0500 ++++ b/debian/README.Debian 2021-11-26 13:26:20.362971709 -0600 @@ -2,7 +2,7 @@ =========== diff --git a/helpers/DATA/distro-info-data/add_trisquel_tools_py.patch b/helpers/DATA/distro-info-data/add_trisquel_tools_py.patch index 29448c1..1c1e7a4 100644 --- a/helpers/DATA/distro-info-data/add_trisquel_tools_py.patch +++ b/helpers/DATA/distro-info-data/add_trisquel_tools_py.patch @@ -1,14 +1,16 @@ ---- lib/tools.py 2021-10-15 08:01:00.000000000 -0500 -+++ lib/tools.py 2022-04-06 12:27:07.672427372 -0500 -@@ -37,7 +37,7 @@ +diff --git a/lib/tools.py b/lib/tools.py +index 2ab74f7f..a3d52620 100644 +--- a/lib/tools.py ++++ b/lib/tools.py +@@ -49,7 +49,7 @@ def get_csv_dict_reader(filename: str) -> csv.DictReader: + def main(validation_function): """Main function with command line parameter parsing.""" - script_name = os.path.basename(sys.argv[0]) -- usage = "%s [-h] -d|-u csv-file" % (script_name) -+ usage = "%s [-h] -d|-u|-t csv-file" % (script_name) - parser = argparse.ArgumentParser(usage=usage) +- parser = argparse.ArgumentParser(usage="%(prog)s [-h] -d|-u csv-file") ++ parser = argparse.ArgumentParser(usage="%(prog)s [-h] -d|-u|-t csv-file") parser.add_argument( + "-d", @@ -56,15 +56,24 @@ default=False, help="validate an Ubuntu CSV file", diff --git a/helpers/DATA/distro-info-data/add_trisquel_validate.patch b/helpers/DATA/distro-info-data/add_trisquel_validate.patch index cfaa25a..09fd9a5 100644 --- a/helpers/DATA/distro-info-data/add_trisquel_validate.patch +++ b/helpers/DATA/distro-info-data/add_trisquel_validate.patch @@ -1,5 +1,5 @@ ---- validate-csv-data 2021-10-15 08:01:00.000000000 -0500 -+++ validate-csv-data 2022-04-06 12:27:29.004706669 -0500 +--- a/validate-csv-data 2021-10-15 08:01:00.000000000 -0500 ++++ b/validate-csv-data 2022-04-06 12:27:29.004706669 -0500 @@ -27,6 +27,13 @@ diff --git a/helpers/DATA/distro-info-data/trisquel.csv b/helpers/DATA/distro-info-data/trisquel.csv index 3a0cf38..17b54c2 100644 --- a/helpers/DATA/distro-info-data/trisquel.csv +++ b/helpers/DATA/distro-info-data/trisquel.csv @@ -12,3 +12,4 @@ version,codename,series,created,release,eol,upstream 9.0 LTS,Etiona,etiona,2017-10-19,2020-10-16,2023-05-31,bionic 10.0 LTS,Nabia,nabia,2019-10-17,2021-12-16,2025-05-29,focal 11.0 LTS,Aramo,aramo,2021-10-14,2023-03-19,2027-06-01,jammy +12.0 LTS,Ecne,ecne,2023-10-12,2029-05-31,2029-05-31,noble diff --git a/helpers/make-distro-info-data b/helpers/make-distro-info-data index ca9edef..cfb7727 100644 --- a/helpers/make-distro-info-data +++ b/helpers/make-distro-info-data @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2023 Luis Guzman +# Copyright (C) 2024 Luis Guzman # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,9 +21,9 @@ VERSION=7 . ./config -patch --no-backup-if-mismatch -p0 < $DATA/add_trisquel_validate.patch -patch --no-backup-if-mismatch -p0 < $DATA/add_trisquel_tools_py.patch -patch --no-backup-if-mismatch -p0 < $DATA/README.Debian.patch +patch_p1 $DATA/add_trisquel_validate.patch +patch_p1 $DATA/add_trisquel_tools_py.patch +patch_p1 $DATA/README.Debian.patch cp $DATA/trisquel.csv ./