diff -pruN 0.13.1-1.1/debian/changelog 0.13.1-1.1ubuntu1/debian/changelog
--- 0.13.1-1.1/debian/changelog	2020-11-24 08:17:37.000000000 +0000
+++ 0.13.1-1.1ubuntu1/debian/changelog	2020-11-25 14:22:06.000000000 +0000
@@ -1,3 +1,11 @@
+gnunet (0.13.1-1.1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
+      (LP #1863026)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 25 Nov 2020 15:22:06 +0100
+
 gnunet (0.13.1-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -5,6 +13,26 @@ gnunet (0.13.1-1.1) unstable; urgency=me
 
  -- Simon Josefsson <simon@josefsson.org>  Tue, 24 Nov 2020 09:17:37 +0100
 
+gnunet (0.13.1-1ubuntu2) hirsute; urgency=medium
+
+  * No-change rebuild to build with python3.9 as default.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 19 Nov 2020 21:26:35 +0100
+
+gnunet (0.13.1-1ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
+      (LP #1863026)
+      [Updated DEP3 header with forwarded information, and refreshed for
+      this new upstream version]
+  * Dropped:
+    - d/control: request python2 explicitly, this doesn't work with py3
+      yet.
+      [Not needed anymore]
+
+ -- Andreas Hasenack <andreas@canonical.com>  Fri, 07 Aug 2020 11:23:38 -0300
+
 gnunet (0.13.1-1) unstable; urgency=medium
 
   * Update debian/watch to version 4, add a rule deal with pre and rc
@@ -95,6 +123,21 @@ gnunet (0.11.0~pre666-1) experimental; u
 
  -- Bertrand Marc <bmarc@debian.org>  Sat, 03 Nov 2018 17:24:53 +0100
 
+gnunet (0.10.1-5.1ubuntu1) focal; urgency=medium
+
+  * d/control: request python2 explicitly, this doesn't work with py3
+    yet.
+  * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
+    (LP: #1863026)
+
+ -- Andreas Hasenack <andreas@canonical.com>  Fri, 14 Feb 2020 19:49:34 -0300
+
+gnunet (0.10.1-5.1build2) eoan; urgency=medium
+
+  * No change rebuild for libmysqlclient21.
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Thu, 15 Aug 2019 10:49:52 +0200
+
 gnunet (0.10.1-5.1) unstable; urgency=high
 
   * Non-maintainer upload.
diff -pruN 0.13.1-1.1/debian/control 0.13.1-1.1ubuntu1/debian/control
--- 0.13.1-1.1/debian/control	2020-11-24 08:17:37.000000000 +0000
+++ 0.13.1-1.1ubuntu1/debian/control	2020-11-24 15:17:06.000000000 +0000
@@ -1,7 +1,8 @@
 Source: gnunet
 Section: net
 Priority: optional
-Maintainer: Bertrand Marc <bmarc@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bertrand Marc <bmarc@debian.org>
 Build-Depends:
  autoconf (>=2.59),
  automake (>=1.11.1),
diff -pruN 0.13.1-1.1/debian/patches/mysql8_my_bool.patch 0.13.1-1.1ubuntu1/debian/patches/mysql8_my_bool.patch
--- 0.13.1-1.1/debian/patches/mysql8_my_bool.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.13.1-1.1ubuntu1/debian/patches/mysql8_my_bool.patch	2020-08-07 14:23:18.000000000 +0000
@@ -0,0 +1,19 @@
+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: https://bugs.gnunet.org/view.php?id=6465
+Last-Update: 2020-08-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h
+index 964483024..01c3b9ee7 100644
+--- a/src/include/gnunet_mysql_lib.h
++++ b/src/include/gnunet_mysql_lib.h
+@@ -32,6 +32,7 @@
+ 
+ #include "gnunet_util_lib.h"
+ #include <mysql/mysql.h>
++typedef bool my_bool;
+ 
+ #ifdef __cplusplus
+ extern "C"
diff -pruN 0.13.1-1.1/debian/patches/series 0.13.1-1.1ubuntu1/debian/patches/series
--- 0.13.1-1.1/debian/patches/series	2020-11-24 08:14:33.000000000 +0000
+++ 0.13.1-1.1ubuntu1/debian/patches/series	2020-11-24 15:17:07.000000000 +0000
@@ -1 +1,2 @@
 0001-Dont_copy_license_file.patch
+mysql8_my_bool.patch