19 files changed, 117 insertions, 81 deletions
diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf
index aa61301297e..5e958e9e697 100644
--- a/debian/additions/mariadb.conf.d/50-server.cnf
+++ b/debian/additions/mariadb.conf.d/50-server.cnf
@@ -56,11 +56,11 @@ bind-address            = 127.0.0.1
 # Enable this if you want to have error logging into a separate file
 #log_error = /var/log/mysql/error.log
 # Enable the slow query log to see queries with especially long duration
-#slow_query_log_file    = /var/log/mysql/mariadb-slow.log
-#long_query_time        = 10
+#log_slow_query_file    = /var/log/mysql/mariadb-slow.log
+#log_slow_query_time    = 10
 #log_slow_verbosity     = query_plan,explain
 #log-queries-not-using-indexes
-#min_examined_row_limit = 1000
+#log_slow_min_examined_row_limit = 1000
 
 # The following can be used as easy to replay backup logs or for replication.
 # note: if you are setting up a replication slave, see README.Debian about
@@ -108,7 +108,7 @@ collation-server      = utf8mb4_general_ci
 # you can put MariaDB-only options here
 [mariadb]
 
-# This group is only read by MariaDB-10.10 servers.
+# This group is only read by MariaDB-10.11 servers.
 # If you use the same .cnf file for MariaDB of different versions,
 # use this group for options that older servers don't understand
-[mariadb-10.10]
+[mariadb-10.11]
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 36cf47b6b94..d9b2b007066 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -70,7 +70,7 @@ disable_pmem()
 
 disable_libfmt()
 {
-  # 0.7+ required
+  # 7.0+ required
   sed '/libfmt-dev/d' -i debian/control
 }
 
diff --git a/debian/changelog b/debian/changelog
index 2f98eccffce..af6536d9be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mariadb (1:10.10.0) unstable; urgency=medium
+mariadb (1:10.11.0) unstable; urgency=medium
 
   * Initial Release
 
diff --git a/debian/control b/debian/control
index 8886da40fdf..91766d64b3e 100644
--- a/debian/control
+++ b/debian/control
@@ -271,8 +271,7 @@ Depends: libmariadb3 (>= 10.5.4),
          mariadb-common (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: mariadb-client (<< ${source:Version}),
-           mariadb-client-10.0,
+Conflicts: mariadb-client-10.0,
            mariadb-client-10.1,
            mariadb-client-10.2,
            mariadb-client-10.3,
@@ -308,7 +307,8 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mysql-client-core-5.7,
            mysql-client-core-8.0,
            virtual-mysql-client-core
-Breaks: mariadb-server-10.0,
+Breaks: mariadb-client (<< ${source:Version}),
+        mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-core (<< ${source:Version}),
         mariadb-server-core-10.0,
@@ -384,7 +384,6 @@ Replaces: mariadb-client (<< ${source:Version}),
           percona-xtradb-cluster-server-5.7,
           virtual-mysql-client-core
 Provides: default-mysql-client-core,
-          mariadb-client-core-10.10,
           virtual-mysql-client-core
 Description: MariaDB database core client binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -403,8 +402,7 @@ Depends: debianutils (>=1.6),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Conflicts: mariadb-client (<< ${source:Version}),
-           mariadb-client-10.0,
+Conflicts: mariadb-client-10.0,
            mariadb-client-10.1,
            mariadb-client-10.2,
            mariadb-client-10.3,
@@ -473,8 +471,7 @@ Breaks: mariadb-client-core (<< ${source:Version}),
         percona-server-server-5.6,
         percona-xtradb-cluster-server-5.6,
         percona-xtradb-cluster-server-5.7
-Replaces: mariadb-client (<< ${source:Version}),
-          mariadb-client-10.0,
+Replaces: mariadb-client-10.0,
           mariadb-client-10.1,
           mariadb-client-10.2,
           mariadb-client-10.3,
@@ -544,7 +541,6 @@ Replaces: mariadb-client (<< ${source:Version}),
           percona-xtradb-cluster-server-5.7,
           virtual-mysql-client
 Provides: default-mysql-client,
-          mariadb-client-10.10,
           virtual-mysql-client
 Recommends: libdbd-mariadb-perl | libdbd-mysql-perl,
             libdbi-perl,
@@ -563,8 +559,7 @@ Architecture: any
 Depends: mariadb-common (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: mariadb-server-core (<< ${source:Version}),
-           mariadb-server-core-10.0,
+Conflicts: mariadb-server-core-10.0,
            mariadb-server-core-10.1,
            mariadb-server-core-10.2,
            mariadb-server-core-10.3,
@@ -658,7 +653,6 @@ Replaces: mariadb-client (<< ${source:Version}),
           percona-xtradb-cluster-server-5.7,
           virtual-mysql-server-core
 Provides: default-mysql-server-core,
-          mariadb-server-core-10.10,
           virtual-mysql-server-core
 Description: MariaDB database core server files
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -695,8 +689,7 @@ Depends: galera-4 (>= 26.4),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Conflicts: mariadb-server (<< ${source:Version}),
-           mariadb-server-10.0,
+Conflicts: mariadb-server-10.0,
            mariadb-server-10.1,
            mariadb-server-10.2,
            mariadb-server-10.3,
@@ -739,7 +732,6 @@ Replaces: handlersocket-mysql-5.5,
           mariadb-client-10.6,
           mariadb-client-10.7,
           mariadb-client-10.8,
-          mariadb-server (<< ${source:Version}),
           mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
@@ -771,7 +763,6 @@ Replaces: handlersocket-mysql-5.5,
           percona-xtradb-cluster-server-5.7,
           virtual-mysql-server
 Provides: default-mysql-server,
-          mariadb-server-10.10,
           virtual-mysql-server
 Description: MariaDB database server binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
diff --git a/debian/mariadb-plugin-provider-bzip2.lintian-overrides b/debian/mariadb-plugin-provider-bzip2.lintian-overrides
index 563c05a3a6b..47298832bcf 100644
--- a/debian/mariadb-plugin-provider-bzip2.lintian-overrides
+++ b/debian/mariadb-plugin-provider-bzip2.lintian-overrides
@@ -1,3 +1,3 @@
 # It's intentional that bzip2 compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_bzip2.so
-\ No newline at end of file
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_bzip2.so]
diff --git a/debian/mariadb-plugin-provider-lz4.lintian-overrides b/debian/mariadb-plugin-provider-lz4.lintian-overrides
index 3f7d7e9ecfb..dbfde133135 100644
--- a/debian/mariadb-plugin-provider-lz4.lintian-overrides
+++ b/debian/mariadb-plugin-provider-lz4.lintian-overrides
@@ -1,3 +1,3 @@
 # It's intentional that LZ4 compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lz4.so
-\ No newline at end of file
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lz4.so]
diff --git a/debian/mariadb-plugin-provider-lzma.lintian-overrides b/debian/mariadb-plugin-provider-lzma.lintian-overrides
index 94eafa766a4..79f6cb793c2 100644
--- a/debian/mariadb-plugin-provider-lzma.lintian-overrides
+++ b/debian/mariadb-plugin-provider-lzma.lintian-overrides
@@ -1,3 +1,3 @@
 # It's intentional that LZMA compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzma.so
-\ No newline at end of file
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lzma.so]
diff --git a/debian/mariadb-plugin-provider-lzo.lintian-overrides b/debian/mariadb-plugin-provider-lzo.lintian-overrides
index 8184923cf9a..ccca4e2d355 100644
--- a/debian/mariadb-plugin-provider-lzo.lintian-overrides
+++ b/debian/mariadb-plugin-provider-lzo.lintian-overrides
@@ -1,3 +1,3 @@
 # It's intentional that LZO compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzo.so
-\ No newline at end of file
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lzo.so]
diff --git a/debian/mariadb-plugin-provider-snappy.lintian-overrides b/debian/mariadb-plugin-provider-snappy.lintian-overrides
index 6c76162573d..b62907c3469 100644
--- a/debian/mariadb-plugin-provider-snappy.lintian-overrides
+++ b/debian/mariadb-plugin-provider-snappy.lintian-overrides
@@ -1,3 +1,3 @@
 # It's intentional that Snappy compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_snappy.so
-\ No newline at end of file
+library-not-linked-against-libc [usr/lib/mysql/plugin/provider_snappy.so]
diff --git a/debian/mariadb-server-core.install b/debian/mariadb-server-core.install
index 1a07a3fea94..4eee370672a 100644
--- a/debian/mariadb-server-core.install
+++ b/debian/mariadb-server-core.install
@@ -15,8 +15,8 @@ usr/share/man/man1/resolveip.1
 usr/share/man/man8/mariadbd.8
 usr/share/man/man8/mysqld.8
 usr/share/mysql/bulgarian
-usr/share/mysql/chinese
 usr/share/mysql/charsets
+usr/share/mysql/chinese
 usr/share/mysql/czech
 usr/share/mysql/danish
 usr/share/mysql/dutch
diff --git a/debian/mariadb-server.install b/debian/mariadb-server.install
index 254e9cc8945..2350196e9d3 100644
--- a/debian/mariadb-server.install
+++ b/debian/mariadb-server.install
@@ -5,6 +5,7 @@ debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
 debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
 debian/additions/source_mariadb.py usr/share/apport/package-hooks
 etc/apparmor.d/usr.sbin.mariadbd
+etc/logrotate.d/mariadb
 etc/security/user_map.conf
 lib/*/security/pam_user_map.so
 lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
diff --git a/debian/mariadb-server.mysql-server.logrotate b/debian/mariadb-server.mysql-server.logrotate
deleted file mode 100644
index 11e4480c427..00000000000
--- a/debian/mariadb-server.mysql-server.logrotate
+++ /dev/null
@@ -1,20 +0,0 @@
-# - I put everything in one block and added sharedscripts, so that mysql gets
-#   flush-logs'd only once.
-#   Else the binary logs would automatically increase by n times every day.
-# - The error log is obsolete, messages go to syslog now.
-/var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/mariadb-slow.log /var/log/mysql/error.log {
-	daily
-	rotate 7
-	missingok
-	create 640 mysql adm
-	compress
-	sharedscripts
-	postrotate
-          test -x /usr/bin/mysqladmin || exit 0
-	  # check if server is running
-          if mysqladmin ping > /dev/null 2>&1; then
-            mysqladmin --defaults-file=/etc/mysql/debian.cnf --local flush-error-log \
-              flush-engine-log flush-general-log flush-slow-log
-          fi
-	endscript
-}
diff --git a/debian/mariadb-server.postinst b/debian/mariadb-server.postinst
index 2da1c736dec..a5ab6e8e1dc 100644
--- a/debian/mariadb-server.postinst
+++ b/debian/mariadb-server.postinst
@@ -220,6 +220,13 @@ EOF
       fi
     fi
 
+    # The introduction of /etc/logrotate.d/mariadb has made the old config
+    # obsolete and it needs to be disabled to prevent logrotate running twice.
+    if [ -f /etc/logrotate.d/mysql-server ]
+    then
+      mv -vf /etc/logrotate.d/mysql-server /etc/logrotate.d/mysql-server.dpkg-bak
+    fi
+
     # @TODO: Remove once buildbot.askmonty.org has been updated not to expect this file
     mkdir -p /etc/systemd/system/mariadb.service.d/
     # Note that file cannot be empty, otherwise systemd version in Ubuntu Bionic
diff --git a/debian/mariadb-test-data.lintian-overrides b/debian/mariadb-test-data.lintian-overrides
index 85e40a8b429..b73e31029e6 100644
--- a/debian/mariadb-test-data.lintian-overrides
+++ b/debian/mariadb-test-data.lintian-overrides
@@ -1,7 +1,5 @@
 # These should be moved, see https://jira.mariadb.org/browse/MDEV-21654
-arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
 arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so]
-arch-independent-package-contains-binary-or-object usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
 arch-independent-package-contains-binary-or-object [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so]
 # Mainly for support for *BSD family. Not right way to do but this is test package and not for production
 incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/std_data/checkDBI_DBD-MariaDB.pl]
diff --git a/debian/mariadb-test.lintian-overrides b/debian/mariadb-test.lintian-overrides
index 5bac3d60cac..d09cfe3c537 100644
--- a/debian/mariadb-test.lintian-overrides
+++ b/debian/mariadb-test.lintian-overrides
@@ -1,6 +1,4 @@
 # These should be moved, see https://jira.mariadb.org/browse/MDEV-21653
-arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process
-arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version
 arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process]
 arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version]
 # Mainly for support for *BSD family. Not right way to do but this is test package and not for production
diff --git a/debian/not-installed b/debian/not-installed
index f209b2394b7..c0d08565616 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,5 +1,4 @@
 etc/columnstore/storagemanager.cnf.example # Copy of etc/columnstore/storagemanager.cnf that is installed
-etc/logrotate.d/mysql # Debian packaging uses mariadb-server.mysql-server.logrotate
 etc/my.cnf # Debian packaging has /etc/mysql/my.cnf, which is a symlink to mariadb.cnf
 etc/mysql/mariadb.conf.d/client.cnf # Debian packaging uses files from debian/additions/mariadb.cnf.d/
 etc/mysql/mariadb.conf.d/enable_encryption.preset # Debian packaging uses files from debian/additions/mariadb.cnf.d/
@@ -51,8 +50,8 @@ usr/share/mysql/Mongo2.jar
 usr/share/mysql/Mongo3.jar
 usr/share/mysql/binary-configure
 usr/share/mysql/magic
+usr/share/mysql/mariadb.logrotate
 usr/share/mysql/maria_add_gis_sp.sql # mariadb-server-core.install has *_bootstrap.sql
-usr/share/mysql/mysql-log-rotate # Debian packaging uses mariadb-server.mysql-server.logrotate
 usr/share/mysql/mysql-test/asan.supp
 usr/share/mysql/mysql-test/lsan.supp
 usr/share/mysql/mysql-test/unstable-tests
diff --git a/debian/rules b/debian/rules
index 5d5766a95c7..0eb80bfb41f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -195,9 +195,6 @@ endif
 	# Move test plugins that are only needed by the client to the libmariadb path
 	mv -v $(TMP)/usr/lib/mysql/plugin/qa_auth_client.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/
 
-override_dh_installlogrotate-arch:
-	dh_installlogrotate --name mysql-server
-
 override_dh_systemd_enable:
 	dh_systemd_enable --name=mariadb
 	dh_systemd_enable --no-enable --name=mariadb mariadb.socket
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index 2392df2be4d..77a8147f470 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -522,6 +522,70 @@ mysql-8.0 Jammy to mariadb upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
+mariadb.org 10.11 to mariadb upgrade:
+  stage: upgrade extras
+  needs:
+    - job: build
+  image: debian:${RELEASE}
+  artifacts:
+    when: always
+    name: "$CI_BUILD_NAME"
+    paths:
+      - ${WORKING_DIR}/debug
+  script:
+    - *test-prepare-container
+    - apt install -y curl
+    - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
+    - echo "deb https://deb.mariadb.org/10.11/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
+    - apt-get update
+    - apt-get install -y mariadb-server
+    - *test-verify-initial
+    # Install MariaDB built in this commit
+    # Force downgrades so our version installs on top of upstream revision, e.g. 1:10.9.1-1 vs 1:10.9.1+mariadb~sid
+    - apt-get install -y --allow-downgrades ./*.deb
+    # Verify installation of MariaDB built in this commit
+    - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
+    - mariadb --version # Client version
+    - service mariadb status # There is no init.d/mysql in MariaDB 10.5+
+    - *test-verify-final
+  variables:
+    GIT_STRATEGY: none
+  except:
+    variables:
+      - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
+
+mariadb.org 10.10 to mariadb upgrade:
+  stage: upgrade extras
+  needs:
+    - job: build
+  image: debian:${RELEASE}
+  artifacts:
+    when: always
+    name: "$CI_BUILD_NAME"
+    paths:
+      - ${WORKING_DIR}/debug
+  script:
+    - *test-prepare-container
+    - apt install -y curl
+    - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
+    - echo "deb https://deb.mariadb.org/10.10/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
+    - apt-get update
+    - apt-get install -y mariadb-server
+    - *test-verify-initial
+    # Install MariaDB built in this commit
+    # Force downgrades so our version installs on top of upstream revision, e.g. 1:10.9.1-1 vs 1:10.9.1+mariadb~sid
+    - apt-get install -y --allow-downgrades ./*.deb
+    # Verify installation of MariaDB built in this commit
+    - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
+    - mariadb --version # Client version
+    - service mariadb status # There is no init.d/mysql in MariaDB 10.5+
+    - *test-verify-final
+  variables:
+    GIT_STRATEGY: none
+  except:
+    variables:
+      - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
+
 mariadb.org 10.9 to mariadb upgrade:
   stage: upgrade extras
   needs:
@@ -538,7 +602,7 @@ mariadb.org 10.9 to mariadb upgrade:
     - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
     - echo "deb https://deb.mariadb.org/10.9/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
     - apt-get update
-    - apt-get install -y mariadb-server-10.9
+    - apt-get install -y mariadb-server
     - *test-verify-initial
     # Install MariaDB built in this commit
     # Force downgrades so our version installs on top of upstream revision, e.g. 1:10.9.1-1 vs 1:10.9.1+mariadb~sid
@@ -553,7 +617,6 @@ mariadb.org 10.9 to mariadb upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb.org-10.8 to mariadb upgrade:
   stage: upgrade extras
@@ -586,7 +649,6 @@ mariadb.org-10.8 to mariadb upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb.org-10.7 to mariadb upgrade:
   stage: upgrade extras
@@ -619,7 +681,6 @@ mariadb.org-10.7 to mariadb upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb.org-10.6 to mariadb upgrade:
   stage: upgrade extras
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 740a7871a2e..306ab27271d 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -4,28 +4,25 @@ version-substvar-for-external-package mariadb-client-core -> mysql-client-5.5
 version-substvar-for-external-package mariadb-server -> mysql-server
 version-substvar-for-external-package libmariadb-dev -> libmysqlclient-dev
 version-substvar-for-external-package libmariadb-dev -> libmysqld-dev
-version-substvar-for-external-package mariadb-server-10.9 -> mysql-client-5.*
-version-substvar-for-external-package mariadb-server-10.9 -> mysql-client-8.*
-version-substvar-for-external-package mariadb-client-10.9 -> mysql-client-core-5.*
-version-substvar-for-external-package mariadb-client-10.9 -> mysql-client-core-8.*
+version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqlclient-dev [debian/control:74]
+version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqld-dev [debian/control:74]
 version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
-# Intentional version-substvar-for-external-package as long as mariadb-server
-# provides mariadb-server-10.10 and mariadb-client provides mariadb-client-10.10
-version-substvar-for-external-package Conflicts (line 408) ${source:Version} mariadb-client -> mariadb-client-10.10
-version-substvar-for-external-package Conflicts (line 575) ${source:Version} mariadb-server-core -> mariadb-server-core-10.10
-version-substvar-for-external-package Conflicts (line 711) ${source:Version} mariadb-server -> mariadb-server-10.10
+version-substvar-for-external-package Replaces ${source:Version} libmariadbd-dev -> libmariadbclient-dev [debian/control:232]
+version-substvar-for-external-package Conflicts (line 408) ${source:Version} mariadb-client -> mariadb-client-10.11
+version-substvar-for-external-package Conflicts (line 575) ${source:Version} mariadb-server-core -> mariadb-server-core-10.11
+version-substvar-for-external-package Conflicts (line 711) ${source:Version} mariadb-server -> mariadb-server-10.11
 version-substvar-for-external-package Conflicts (line 95) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
 version-substvar-for-external-package Replaces (line 109) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
-version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-client-10.10
-version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-server-core-10.10
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-10.10
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-core-10.10
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-10.10
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-core-10.10
-version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-client-10.10
-version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-server-10.10
-version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-client-10.10
-version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.10
+version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-client-10.11
+version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-server-core-10.11
+version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-10.11
+version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-core-10.11
+version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-10.11
+version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-core-10.11
+version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-client-10.11
+version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-server-10.11
+version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-client-10.11
+version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.11
 # ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
 source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
 source-is-missing [storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2]
@@ -106,3 +103,10 @@ source-contains-autogenerated-visual-c++-file storage/columnstore/columnstore/*.
 source-contains-autogenerated-visual-c++-file storage/columnstore/columnstore/*.h
 source-contains-autogenerated-visual-c++-file win/upgrade_wizard/resource.h
 source-contains-autogenerated-visual-c++-file win/upgrade_wizard/upgrade.rc
+
+# New in 10.11
+version-substvar-for-external-package Conflicts ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev [debian/control:95]
+version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev [debian/control:109]
+missing-build-dependency-for-dh-addon systemd (does not satisfy debhelper:any (>= 9.20160709~) | debhelper-compat:any | dh-sequence-systemd:any | dh-systemd:any) [debian/rules]
+source-is-missing [sql/share/charsets/languages.html]
+source-is-missing [storage/rocksdb/rocksdb/docs/_includes/footer.html]