diff -pruN 2.7.0-2/debian/changelog 2.7.0-2ubuntu4/debian/changelog
--- 2.7.0-2/debian/changelog	2020-11-01 20:11:37.000000000 +0000
+++ 2.7.0-2ubuntu4/debian/changelog	2021-12-03 13:33:33.000000000 +0000
@@ -1,3 +1,28 @@
+jabberd2 (2.7.0-2ubuntu4) jammy; urgency=medium
+
+  * No-change rebuild against openssl3
+
+ -- Simon Chopin <simon.chopin@canonical.com>  Fri, 03 Dec 2021 14:33:33 +0100
+
+jabberd2 (2.7.0-2ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild against libidn12
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 07 Nov 2021 05:32:47 +0000
+
+jabberd2 (2.7.0-2ubuntu2) impish; urgency=medium
+
+  * No-change rebuild due to OpenLDAP soname bump.
+
+ -- Sergio Durigan Junior <sergio.durigan@canonical.com>  Mon, 21 Jun 2021 17:49:05 -0400
+
+jabberd2 (2.7.0-2ubuntu1) impish; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
+
+ -- Logan Rosen <logan@ubuntu.com>  Tue, 15 Jun 2021 21:03:50 -0400
+
 jabberd2 (2.7.0-2) unstable; urgency=medium
 
   [ Simon Josefsson ]
@@ -23,6 +48,19 @@ jabberd2 (2.7.0-2) unstable; urgency=med
 
  -- Simon Josefsson <simon@josefsson.org>  Sun, 01 Nov 2020 21:11:37 +0100
 
+jabberd2 (2.7.0-1ubuntu1) focal; urgency=medium
+
+  * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
+    (LP: #1863026)
+
+ -- Andreas Hasenack <andreas@canonical.com>  Thu, 13 Feb 2020 13:24:51 -0300
+
+jabberd2 (2.7.0-1build2) eoan; urgency=medium
+
+  * No change rebuild for libmysqlclient21.
+
+ -- Robie Basak <robie.basak@ubuntu.com>  Mon, 12 Aug 2019 12:01:37 +0000
+
 jabberd2 (2.7.0-1) unstable; urgency=medium
 
   * New upstream version.
@@ -431,3 +469,4 @@ jabberd2 (1+2.0.0-a4-1) unstable; urgenc
   * Initial Release.
 
  -- Jamin W. Collins <jcollins@asgardsrealm.net>  Thu,  8 May 2003 14:31:28 -0600
+
diff -pruN 2.7.0-2/debian/control 2.7.0-2ubuntu4/debian/control
--- 2.7.0-2/debian/control	2020-11-01 20:11:37.000000000 +0000
+++ 2.7.0-2ubuntu4/debian/control	2020-11-02 04:48:39.000000000 +0000
@@ -1,7 +1,8 @@
 Source: jabberd2
 Section: net
 Priority: optional
-Maintainer: Debian XMPP Maintainers <pkg-xmpp-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian XMPP Maintainers <pkg-xmpp-devel@lists.alioth.debian.org>
 Uploaders: Simon Josefsson <simon@josefsson.org>
 Build-Depends: check,
                debhelper-compat (= 13),
diff -pruN 2.7.0-2/debian/patches/mysql8_my_bool.patch 2.7.0-2ubuntu4/debian/patches/mysql8_my_bool.patch
--- 2.7.0-2/debian/patches/mysql8_my_bool.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.7.0-2ubuntu4/debian/patches/mysql8_my_bool.patch	2020-02-13 16:24:17.000000000 +0000
@@ -0,0 +1,31 @@
+Description: Reintroduce my_bool to fix build with MySQL 8
+Author: Andreas Hasenack <andreas@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gambas3/+bug/1863026
+Forwarded: no
+Last-Update: 2020-02-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/storage/authreg_mysql.c b/storage/authreg_mysql.c
+index 0b35d6d..4b7f842 100644
+--- a/storage/authreg_mysql.c
++++ b/storage/authreg_mysql.c
+@@ -23,6 +23,7 @@
+ #define _XOPEN_SOURCE 500
+ #include "c2s.h"
+ #include <mysql.h>
++typedef bool my_bool;
+ #include <stdlib.h>
+ #include <openssl/rand.h>
+ 
+diff --git a/storage/storage_mysql.c b/storage/storage_mysql.c
+index eb4f62f..e05682e 100644
+--- a/storage/storage_mysql.c
++++ b/storage/storage_mysql.c
+@@ -28,6 +28,7 @@
+ #include "storage.h"
+ #include <inttypes.h>
+ #include <mysql.h>
++typedef bool my_bool;
+ 
+ /** internal structure, holds our data */
+ typedef struct drvdata_st {
diff -pruN 2.7.0-2/debian/patches/series 2.7.0-2ubuntu4/debian/patches/series
--- 2.7.0-2/debian/patches/series	2020-11-01 20:06:47.000000000 +0000
+++ 2.7.0-2ubuntu4/debian/patches/series	2020-11-02 04:48:40.000000000 +0000
@@ -6,3 +6,4 @@ etc_pidpath.diff
 pkgname.diff
 systemd-alias.diff
 m4-ax_check_compile_flag.diff
+mysql8_my_bool.patch