Remove 18.04 from default distros, add 22.04 and 22.10
Refs: #5244
Change-Id: I2f7cfc58ae8169ac3f0ebecd3c6b9d5d2f64a059
diff --git a/README.md b/README.md
index 2adfa16..5ddd600 100644
--- a/README.md
+++ b/README.md
@@ -2,34 +2,35 @@
## Prerequisites
-The following packages needs to be installed in order to build source .deb package to be
-upload to PPA:
+The following dependencies need to be installed in order to build the source `.deb` packages
+to be uploaded to the PPA:
- sudo apt-get install git devscripts debhelper dh-make
+ sudo apt install git devscripts debhelper dh-make
## Building source packages
-The build process is very much automated and the following command can be used to build
-all packages and upload them to the ppa.
+The build process is fully automated. The following command can be used to build all
+packages and upload them to the PPA:
make dput
-Before running dput make sure that you have access to upload packages to `named-data/ppa`
-(or modify target PPA repository in `packaging.mk`).
+Before running `dput`, make sure that you have access to upload packages to `named-data/ppa`
+(or modify the target PPA repository in `packaging.mk`).
To build a specific package, go to the package's folder and run the same `make dput` command.
## Advanced uses
-The scripts by default create source packages for Ubuntu 16.04 (xenial) and 18.04 (bionic).
-If necessary, default actions and distributions can be overriden:
+By default, the scripts will create source packages for Ubuntu 20.04 (focal), 22.04 (jammy),
+and 22.10 (kinetic). If necessary, the default actions and distributions can be overriden,
+for example:
-To only build source packages (no upload), only for Ubuntu 12.04:
+* To only build source packages (no upload), only for Ubuntu 12.04:
- make build DISTROS=precise
+ make build DISTROS=precise
-To build binary package that can be installed with `dpkg -i <package>.deb`:
+* To build binary package that can be installed with `sudo dpkg -i <package>.deb`:
- make build DEBUILD=debuild DISTROS=precise
+ make build DEBUILD=debuild DISTROS=precise
-The built package will be in `<package-folder>/work/<package-name>_<version>.deb`
+ The built package will be in `<package-folder>/work/<package-name>_<version>.deb`
diff --git a/packaging.mk b/packaging.mk
index 661bd98..da88db5 100644
--- a/packaging.mk
+++ b/packaging.mk
@@ -2,7 +2,7 @@
PPA=ppa:named-data/ppa-dev
# List of target distributions
-DISTROS=bionic focal impish
+DISTROS=focal jammy kinetic
DEBUILD=debuild -S -d