From 431cc6fcf891c0b10e015805dae7584fe6b768aa Mon Sep 17 00:00:00 2001
From: Jonathon Weiss <jweiss@mit.edu>
Date: Fri, 25 Aug 2023 15:49:47 -0400
Subject: [PATCH] Build for Jammy

---
 debian/changelog     | 6 ++++++
 debian/control       | 2 +-
 generate_sysnames.py | 7 +++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fdace6d..85f029b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-machtype (10.9) unstable; urgency=medium
+
+  * Build for Jammy
+
+ -- Jonathon Weiss <jweiss@mit.edu>  Fri, 25 Aug 2023 15:43:54 -0400
+
 debathena-machtype (10.8) unstable; urgency=low
 
   * Fix build for bionic, which has a base-files version of 10
diff --git a/debian/control b/debian/control
index f469b72..7735b60 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debathena Project <debathena@mit.edu>
 Build-Depends: debhelper,
  lsb-release,
- python-minimal (>= 2.6~),
+ python-minimal (>= 2.6~) | python2 (>= 2.6~),
  openafs-client (>= 1.4.12+dfsg-3~),
 Standards-Version: 3.9.3
 
diff --git a/generate_sysnames.py b/generate_sysnames.py
index f2c81e0..02c1ff4 100755
--- a/generate_sysnames.py
+++ b/generate_sysnames.py
@@ -117,7 +117,10 @@ def __init__(self, version, **kwargs):
 # Update this when a new release comes online
 # add "deprecated=True" to distros when we stop building for
 # them.
-distros = [Debian('10.2ubuntu7', sysver='10.0'), # buster release a year after bionic, so cut-off at eoan
+distros = [
+           Ubuntu('22.04'),
+           Ubuntu('20.04'),
+           Debian('10.2ubuntu7', sysver='10.0'), # buster release a year after bionic, so cut-off at eoan
            Ubuntu('18.04'),
            Ubuntu('17.10', deprecated=True),
            Ubuntu('17.04', deprecated=True),
@@ -135,7 +138,7 @@ def __init__(self, version, **kwargs):
            Ubuntu('12.10', deprecated=True),
            Ubuntu('12.04'),
            Ubuntu('11.10', deprecated=True),
-           Debian('6.0'),
+           Debian('6.0',   deprecated=True),
            Ubuntu('11.04', deprecated=True),
            Ubuntu('10.10', deprecated=True),
            Ubuntu('10.04'),