Control: tag -1 patch
attached are two patches for mariadb-10.5 and galera-4 that might solve
the upgrade issues, trying them now ...
Andreas
diff -Nru galera-4-26.4.8/debian/changelog galera-4-26.4.8/debian/changelog
--- galera-4-26.4.8/debian/changelog 2021-05-26 05:38:32.000000000 +0200
+++ galera-4-26.4.8/debian/changelog 2021-07-05 22:14:25.000000000 +0200
@@ -1,3 +1,10 @@
+galera-4 (26.4.8-2) UNRELEASED; urgency=medium
+
+ * Solve circular Conflicts with galera-3 by no longer providing a virtual
+ galera package. (Closes: #990708)
+
+ -- Andreas Beckmann <a...@debian.org> Mon, 05 Jul 2021 22:14:25 +0200
+
galera-4 (26.4.8-1) unstable; urgency=medium
* New upstream release 26.4.8
diff -Nru galera-4-26.4.8/debian/control galera-4-26.4.8/debian/control
--- galera-4-26.4.8/debian/control 2021-05-26 05:38:25.000000000 +0200
+++ galera-4-26.4.8/debian/control 2021-07-05 22:14:25.000000000 +0200
@@ -20,8 +20,7 @@
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends}
-Conflicts: galera,
- galera-3,
+Conflicts:
garbd-2,
garbd-3,
garbd2,
@@ -34,13 +33,12 @@
percona-xtradb-cluster-galera-4.x,
percona-xtradb-cluster-garbd-2.x,
percona-xtradb-cluster-garbd-3.x
-Provides: galera,
+Provides:
galera4,
percona-xtradb-cluster-galera-26,
wsrep
-Breaks: galera,
- galera-3
-Replaces: galera
+Breaks: galera-3 (<< 26.4)
+Replaces: galera-3 (<< 26.4)
Description: Replication framework for transactional applications
Galera is a fast synchronous multimaster wsrep provider (replication engine)
for transactional databases and similar applications. For more information
diff -Nru mariadb-10.5-10.5.10/debian/changelog mariadb-10.5-10.5.10/debian/changelog
--- mariadb-10.5-10.5.10/debian/changelog 2021-05-24 06:04:38.000000000 +0200
+++ mariadb-10.5-10.5.10/debian/changelog 2021-07-05 09:53:32.000000000 +0200
@@ -1,3 +1,10 @@
+mariadb-10.5 (1:10.5.10-3) UNRELEASED; urgency=medium
+
+ * mariadb-server-10.5: Add Breaks: galera-3 (<< 26.4) to ease switching from
+ galera-3 to galera-4 on upgrades from buster. (Closes: #990708)
+
+ -- Andreas Beckmann <a...@debian.org> Mon, 05 Jul 2021 09:53:32 +0200
+
mariadb-10.5 (1:10.5.10-2) unstable; urgency=medium
* Bugfix: Revert upstream code change to fix armhf build (Closes: #988629)
diff -Nru mariadb-10.5-10.5.10/debian/control mariadb-10.5-10.5.10/debian/control
--- mariadb-10.5-10.5.10/debian/control 2021-05-21 07:09:56.000000000 +0200
+++ mariadb-10.5-10.5.10/debian/control 2021-07-05 09:53:32.000000000 +0200
@@ -339,7 +339,7 @@
Pre-Depends: adduser (>= 3.40),
debconf,
mariadb-common (>= ${source:Version})
-Depends: galera-4 (>=26.4),
+Depends: galera-4 (>= 26.4),
gawk,
iproute2 [linux-any],
libdbi-perl,
@@ -364,6 +364,7 @@
mysql-server-core-8.0,
virtual-mysql-server
Breaks: cqrlog (<< 1.9.0-5~),
+ galera-3 (<< 26.4),
mariadb-galera-server,
mariadb-galera-server-10.0,
mariadb-galera-server-5.5,
