diff -pruN 1.10.0-1/debian/changelog 1.10.0-1ubuntu2/debian/changelog
--- 1.10.0-1/debian/changelog	2021-02-16 17:33:36.000000000 +0000
+++ 1.10.0-1ubuntu2/debian/changelog	2021-11-23 16:58:31.000000000 +0000
@@ -1,3 +1,21 @@
+librelp (1.10.0-1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild against openssl3
+
+ -- Simon Chopin <simon.chopin@canonical.com>  Tue, 23 Nov 2021 17:58:31 +0100
+
+librelp (1.10.0-1ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable.
+    Remaining changes:
+    - d/p/shrink-receiver-abort-tests.sh: Reduce message count
+      so tests pass on slow platforms like riscv64.
+    - Reduce message count in tests/(tls-)basic-realistic.sh so they reliably
+      succeed on slow platforms like riscv64.
+      - d/p/shrink-basic-realistic-tests.sh
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 25 Feb 2021 15:14:17 +0100
+
 librelp (1.10.0-1) unstable; urgency=medium
 
   * New upstream version 1.10.0
@@ -8,6 +26,29 @@ librelp (1.10.0-1) unstable; urgency=med
 
  -- Michael Biebl <biebl@debian.org>  Tue, 16 Feb 2021 18:33:36 +0100
 
+librelp (1.9.0-1ubuntu2) hirsute; urgency=medium
+
+  * Reduce message count in tests/(tls-)basic-realistic.sh so they reliably
+    succeed on slow platforms like riscv64. (LP: #1912969)
+    - d/p/shrink-basic-realistic-tests.sh
+
+ -- Matthew Ruffell <matthew.ruffell@canonical.com>  Tue, 26 Jan 2021 09:20:11 +1300
+
+librelp (1.9.0-1ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. (LP: #1910307)
+    Remaining changes:
+    [ William Grant ]
+    - d/p/shrink-receiver-abort-tests.sh: Reduce message count
+      so tests pass on slow platforms like riscv64.
+    Dropped changes:
+    - d/p/python2.diff: No longer needed due to tests being 
+      ported to python3 in recent versions.
+  * Fix file descriptor leak as sockets are stuck in CLOSE_WAIT
+    due to not being closed properly due to memory leak. (LP: #1908473)
+
+ -- Matthew Ruffell <matthew.ruffell@canonical.com>  Thu, 26 Nov 2020 21:52:43 +0000
+
 librelp (1.9.0-1) unstable; urgency=medium
 
   * New upstream version 1.9.0
@@ -46,6 +87,20 @@ librelp (1.6.0-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Wed, 22 Apr 2020 13:38:25 +0200
 
+librelp (1.5.0-1ubuntu2) focal; urgency=medium
+
+  * Reduce message count in tests/(tls-)receiver-abort.sh so they reliably
+    succeed on slow platforms like riscv64.
+
+ -- William Grant <wgrant@ubuntu.com>  Tue, 21 Apr 2020 14:07:02 +1000
+
+librelp (1.5.0-1ubuntu1) focal; urgency=medium
+
+  * Build-depend on python2.
+  * Build using python2.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 27 Mar 2020 14:06:00 +0100
+
 librelp (1.5.0-1) unstable; urgency=medium
 
   * New upstream version 1.5.0
@@ -348,3 +403,4 @@ librelp (0.1.3-1) unstable; urgency=low
   * New upstream release. Closes: #497613
 
  -- Michael Biebl <biebl@debian.org>  Tue, 10 Feb 2009 20:43:37 +0100
+
diff -pruN 1.10.0-1/debian/control 1.10.0-1ubuntu2/debian/control
--- 1.10.0-1/debian/control	2021-02-16 17:33:36.000000000 +0000
+++ 1.10.0-1ubuntu2/debian/control	2021-02-25 14:14:17.000000000 +0000
@@ -1,7 +1,8 @@
 Source: librelp
 Section: libs
 Priority: optional
-Maintainer: Michael Biebl <biebl@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
 Build-Depends: debhelper-compat (= 13),
                autoconf-archive,
                libgnutls28-dev (>= 2.10.0),
diff -pruN 1.10.0-1/debian/patches/series 1.10.0-1ubuntu2/debian/patches/series
--- 1.10.0-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 1.10.0-1ubuntu2/debian/patches/series	2021-02-25 14:14:17.000000000 +0000
@@ -0,0 +1,2 @@
+shrink-receiver-abort-tests.sh
+shrink-basic-realistic-tests.sh
diff -pruN 1.10.0-1/debian/patches/shrink-basic-realistic-tests.sh 1.10.0-1ubuntu2/debian/patches/shrink-basic-realistic-tests.sh
--- 1.10.0-1/debian/patches/shrink-basic-realistic-tests.sh	1970-01-01 00:00:00.000000000 +0000
+++ 1.10.0-1ubuntu2/debian/patches/shrink-basic-realistic-tests.sh	2021-02-25 14:14:17.000000000 +0000
@@ -0,0 +1,31 @@
+Description: Shrink (tls-)basic-realistic tests
+ Reduce the message count so they reliably succeed on slow platforms like
+ riscv64. Fast platforms work too.
+Author: Matthew Ruffell <matthew.ruffell@canonical.com>
+
+Index: librelp-1.9.0/tests/basic-realistic.sh
+===================================================================
+--- librelp-1.9.0.orig/tests/basic-realistic.sh	2021-01-26 09:19:29.368570620 +1300
++++ librelp-1.9.0/tests/basic-realistic.sh	2021-01-26 09:19:29.312572186 +1300
+@@ -3,7 +3,7 @@
+ # a more relastic test which actually sends a bit larger number
+ # of messages
+ . ${srcdir:=$(pwd)}/test-framework.sh
+-NUMMESSAGES=50000
++NUMMESSAGES=10000
+ startup_receiver
+ ./send -t 127.0.0.1 -p $TESTPORT -n$NUMMESSAGES $OPT_VERBOSE
+ stop_receiver
+Index: librelp-1.9.0/tests/tls-basic-realistic.sh
+===================================================================
+--- librelp-1.9.0.orig/tests/tls-basic-realistic.sh	2021-01-26 09:19:29.368570620 +1300
++++ librelp-1.9.0/tests/tls-basic-realistic.sh	2021-01-26 09:19:29.364570732 +1300
+@@ -3,7 +3,7 @@
+ # a more relastic test which actually sends a bit larger number
+ # of messages
+ . ${srcdir:=$(pwd)}/test-framework.sh
+-NUMMESSAGES=50000
++NUMMESSAGES=10000
+ 
+ function actual_test() {
+ 	startup_receiver --tls-lib $TEST_TLS_LIB -T -a "name" -x ${srcdir}/tls-certs/ca.pem \
diff -pruN 1.10.0-1/debian/patches/shrink-receiver-abort-tests.sh 1.10.0-1ubuntu2/debian/patches/shrink-receiver-abort-tests.sh
--- 1.10.0-1/debian/patches/shrink-receiver-abort-tests.sh	1970-01-01 00:00:00.000000000 +0000
+++ 1.10.0-1ubuntu2/debian/patches/shrink-receiver-abort-tests.sh	2021-02-25 14:14:17.000000000 +0000
@@ -0,0 +1,42 @@
+Description: Shrink (tls-)receiver-abort tests
+ Reduce the message count so they reliably succeed on slow platforms like
+ riscv64. Fast platforms work too.
+Author: William Grant <wgrant@ubuntu.com>
+
+Index: librelp-1.9.0-1ubuntu1/tests/receiver-abort.sh
+===================================================================
+--- librelp-1.9.0-1ubuntu1.orig/tests/receiver-abort.sh	2021-01-06 17:15:14.209477534 +1300
++++ librelp-1.9.0-1ubuntu1/tests/receiver-abort.sh	2021-01-06 17:15:14.205477483 +1300
+@@ -5,11 +5,11 @@
+ . ${srcdir:=$(pwd)}/test-framework.sh
+ # export OPT_VERBOSE=-v # uncomment for debugging 
+ export errorlog="error.$LIBRELP_DYN.log"
+-export NUMMESSAGES=100000
++export NUMMESSAGES=10000
+ check_command_available timeout
+ 
+ startup_receiver -e ${TESTDIR}/${errorlog}
+-./send -t 127.0.0.1 -p $TESTPORT -n$NUMMESSAGES --no-exit-on-error --kill-on-msg 20000 --kill-pid $RECEIVE_PID $OPT_VERBOSE &
++./send -t 127.0.0.1 -p $TESTPORT -n$NUMMESSAGES --no-exit-on-error --kill-on-msg 2000 --kill-pid $RECEIVE_PID $OPT_VERBOSE &
+ SENDER_PID=$!
+ 
+ for i in {1..3};  do
+Index: librelp-1.9.0-1ubuntu1/tests/tls-receiver-abort.sh
+===================================================================
+--- librelp-1.9.0-1ubuntu1.orig/tests/tls-receiver-abort.sh	2021-01-06 17:15:14.209477534 +1300
++++ librelp-1.9.0-1ubuntu1/tests/tls-receiver-abort.sh	2021-01-06 17:15:14.205477483 +1300
+@@ -4,12 +4,12 @@
+ # of messages
+ . ${srcdir:=$(pwd)}/test-framework.sh
+ check_command_available timeout
+-export NUMMESSAGES=100000
++export NUMMESSAGES=10000
+ 
+ actual_test() {
+ 	startup_receiver
+ 	./send -t 127.0.0.1 -p $TESTPORT -n$NUMMESSAGES --no-exit-on-error \
+-		--kill-on-msg 20000 --kill-pid $RECEIVE_PID $OPT_VERBOSE &
++		--kill-on-msg 2000 --kill-pid $RECEIVE_PID $OPT_VERBOSE &
+ 	SENDER_PID=$!
+ 
+ 	for i in {1..3};  do
