Merge ~ballot/mailman3-core-charm/+git/mailman3-core-charm:update_focal into mailman3-core-charm:master

[Benjamin Allot]

Add focal support

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Unmerged commits

a6801bd... by Benjamin Allot on 2021-09-15

Add support for focal

14075c2... by Benjamin Allot on 2021-09-15

Fix charm-build recip

diff --git a/Makefile b/Makefile
index 915cac6..ab74f86 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,6 @@ charm-build:
         else \
                 git clone -- $(CHARM_REPO) $(CHARM_DEST)/; \
 	fi
-	rsync -a --exclude .git --delete -- $(TMP_CHARM_BUILD_DIR)/builds/$(CHARM_NAME)/ $(CHARM_DEST)/
+	rsync -a --exclude .git --delete -- $(TMP_CHARM_BUILD_DIR)/$(CHARM_NAME)/ $(CHARM_DEST)/
 	@echo "Built charm in $(CHARM_DEST)"
 	rm -rf -- $(TMP_CHARM_BUILD_DIR)
diff --git a/metadata.yaml b/metadata.yaml
index 6cc5691..5022ca9 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -4,6 +4,7 @@ maintainer: Dave Lawson <[e-mail]>
 description: |
   The mailman3 mail processing sub-system providing the various queue runners, etc.
 series:
+  - focal
   - bionic
 tags:
   # Replace "misc" with one or more whitelisted tags from this list: