diff -pruN 1.1.12-4/debian/changelog 1.1.12-4ubuntu2/debian/changelog
--- 1.1.12-4/debian/changelog	2019-08-14 08:09:09.000000000 +0000
+++ 1.1.12-4ubuntu2/debian/changelog	2020-03-23 06:20:21.000000000 +0000
@@ -1,3 +1,16 @@
+mysql-connector-c++ (1.1.12-4ubuntu2) focal; urgency=medium
+
+  * No-change rebuild for libgcc-s1 package name change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 23 Mar 2020 07:20:21 +0100
+
+mysql-connector-c++ (1.1.12-4ubuntu1) eoan; urgency=medium
+
+  * d/p/mysql-connector-cpp-mariadb.patch: correctly detect MariaDB to fix
+    build for MySQL 8.0.
+
+ -- Robie Basak <robie.basak@ubuntu.com>  Wed, 14 Aug 2019 17:26:32 +0000
+
 mysql-connector-c++ (1.1.12-4) unstable; urgency=medium
 
   [ Rene Engelhard ]
diff -pruN 1.1.12-4/debian/control 1.1.12-4ubuntu2/debian/control
--- 1.1.12-4/debian/control	2019-08-11 07:11:57.000000000 +0000
+++ 1.1.12-4ubuntu2/debian/control	2019-08-14 17:26:32.000000000 +0000
@@ -1,7 +1,8 @@
 Source: mysql-connector-c++
 Section: libs
 Priority: optional
-Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
 Uploaders: Dmitry Smirnov <onlyjob@debian.org>
 Build-Depends: debhelper (>= 12~), dh-exec (>= 0.3), cmake
 #  ,libmysqlclient-dev (>= 5.7.8)
diff -pruN 1.1.12-4/debian/patches/mysql-connector-cpp-mariadb.patch 1.1.12-4ubuntu2/debian/patches/mysql-connector-cpp-mariadb.patch
--- 1.1.12-4/debian/patches/mysql-connector-cpp-mariadb.patch	2019-08-11 07:11:57.000000000 +0000
+++ 1.1.12-4ubuntu2/debian/patches/mysql-connector-cpp-mariadb.patch	2019-08-14 17:26:32.000000000 +0000
@@ -1,8 +1,22 @@
-Last-Update: 2019-07-27
+Last-Update: 2019-08-14
 Forwarded: not-needed
 Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Author: Robie Basak <robie.basak@canonical.com>
 Description: fix FTBFS with MariaDB. This patch has been taken from Fedora's SRPM.
+ 2019-08-14: [rbasak] amended to actually detect MySQL vs. MariaDB
 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -352,6 +352,9 @@
+ SET(MYSQLCPPCONN_LINK_FLAGS_ENV "$ENV{LDFLAGS}")
+ MESSAGE(STATUS "Environment link flags: ${MYSQLCPPCONN_LINK_FLAGS_ENV}")
+ 
++include(CheckSymbolExists)
++CHECK_SYMBOL_EXISTS(MARIADB_BASE_VERSION mysql/mysql.h MYCPPCONN_MARIADB_BUILD)
++
+ # Configuring header file with DM version info
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cppconn/version_info.h.cmake
+                ${CMAKE_BINARY_DIR}/cppconn/version_info.h @ONLY)
 --- a/cppconn/version_info.h.cmake
 +++ b/cppconn/version_info.h.cmake
 @@ -41,6 +41,7 @@
@@ -10,7 +24,7 @@ Description: fix FTBFS with MariaDB. Thi
  
  #define MYCPPCONN_STATIC_MYSQL_VERSION     "@MYSQL_VERSION@"
  #define MYCPPCONN_STATIC_MYSQL_VERSION_ID  @MYSQL_NUM_VERSION@
-+#define MYCPPCONN_MARIADB_BUILD
++#cmakedefine MYCPPCONN_MARIADB_BUILD
  
  #define MYCPPCONN_BOOST_VERSION            @Boost_VERSION@
 --- a/driver/mysql_connection.cpp