diff -Nru oce-0.18.3/debian/changelog oce-0.18.3/debian/changelog
--- oce-0.18.3/debian/changelog	2020-03-23 06:21:11.000000000 +0000
+++ oce-0.18.3/debian/changelog	2021-09-16 17:18:41.000000000 +0000
@@ -1,8 +1,9 @@
-oce (0.18.3-1build1) focal; urgency=medium
+oce (0.18.3-2) unstable; urgency=medium
 
-  * No-change rebuild for libgcc-s1 package name change.
+  * Team upload.
+  * [11daad6] Fix autopkgtest regression with CMake 3.19+
 
- -- Matthias Klose <doko@ubuntu.com>  Mon, 23 Mar 2020 07:21:11 +0100
+ -- Timo Röhling <roehling@debian.org>  Thu, 16 Sep 2021 19:18:41 +0200
 
 oce (0.18.3-1) unstable; urgency=medium
 
diff -Nru oce-0.18.3/debian/patches/cmake_minimum_required_version_2.8.12.patch oce-0.18.3/debian/patches/cmake_minimum_required_version_2.8.12.patch
--- oce-0.18.3/debian/patches/cmake_minimum_required_version_2.8.12.patch	1970-01-01 00:00:00.000000000 +0000
+++ oce-0.18.3/debian/patches/cmake_minimum_required_version_2.8.12.patch	2021-09-16 17:17:43.000000000 +0000
@@ -0,0 +1,65 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
+Date: Thu, 16 Sep 2021 19:06:32 +0200
+Subject: Require at least CMake 2.8.12
+
+---
+ CMakeLists.txt                                  | 4 ++--
+ examples/find_package/CMakeLists.txt            | 2 +-
+ examples/find_package_components/CMakeLists.txt | 2 +-
+ examples/find_package_oce/CMakeLists.txt        | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca38e26..8bf759a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,8 +33,8 @@ set(OCE_VERSION ${OCE_VERSION_MAJOR}.${OCE_VERSION_MINOR}${OCE_VERSION_DEVEL})
+ set(OCE_ABI_SOVERSION 11)
+ set(OCE_ABI_VERSION ${OCE_ABI_SOVERSION}.0.0)
+ 
+-# Set the minimum version of cmake required to 2.6
+-cmake_minimum_required( VERSION 2.6 )
++# Set the minimum version of cmake required to 2.8.12
++cmake_minimum_required( VERSION 2.8.12 )
+ 
+ # Policy CMP0043 introduced in cmake version 3.0 IGNORES the use of COMPILE_DEFINITIONS suffixed variables, e.g. COMPILE_DEFINITIONS_DEBUG
+ # Set to OLD behavior until minimum cmake version >= 2.8.10 (version that COMPILE_DEFINITIONS can be set by generator expressions instead)
+diff --git a/examples/find_package/CMakeLists.txt b/examples/find_package/CMakeLists.txt
+index cafca04..378c493 100644
+--- a/examples/find_package/CMakeLists.txt
++++ b/examples/find_package/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # This example shows how to use find_package(OCE).
+ # If OCE is not found, try to find an OpenCascade installation.
+ 
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.8.12)
+ 
+ project (Test)
+ 
+diff --git a/examples/find_package_components/CMakeLists.txt b/examples/find_package_components/CMakeLists.txt
+index 62a1f1d..1e83b66 100644
+--- a/examples/find_package_components/CMakeLists.txt
++++ b/examples/find_package_components/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ # If a toolkit is missing or if OCE is not found, try to find
+ # an OpenCascade installation.
+ 
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.8.12)
+ 
+ set(OCE_TOOLKITS TKPrim)
+ find_package(OCE COMPONENTS ${OCE_TOOLKITS})
+diff --git a/examples/find_package_oce/CMakeLists.txt b/examples/find_package_oce/CMakeLists.txt
+index 93b3663..f9f1759 100644
+--- a/examples/find_package_oce/CMakeLists.txt
++++ b/examples/find_package_oce/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ # If a toolkit is missing or if OCE is not found, a fatal error
+ # is thrown, we do not try to find an Opencascade installation.
+ 
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.8.12)
+ 
+ find_package(OCE REQUIRED COMPONENTS TKPrim)
+ 
diff -Nru oce-0.18.3/debian/patches/series oce-0.18.3/debian/patches/series
--- oce-0.18.3/debian/patches/series	2018-05-09 20:09:54.000000000 +0000
+++ oce-0.18.3/debian/patches/series	2021-09-16 17:17:43.000000000 +0000
@@ -2,3 +2,4 @@
 speedup-BRepMesh_test.patch
 fix_FTBFS_gcc72.patch
 fix-cmake-warning.patch
+cmake_minimum_required_version_2.8.12.patch