merge with 5.5-release

debian/dist/Debian/control

@@ -14,7 +14,7 @@ Package: libmariadbclient18
 Section: libs
 Architecture: any
 Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mariadb-server-5.5 (<< 5.5.32)
+Conflicts: mariadb-server-5.5 (<< 5.5.33)
 Description: MariaDB database client library
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -169,7 +169,7 @@ Architecture: any
 Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
 Conflicts: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
-    mariadb-server-5.5 (<< 5.5.32)
+    mariadb-server-5.5 (<< 5.5.33)
 Replaces: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
 Description: MariaDB database regression test suite
@@ -240,7 +240,7 @@ Description: MariaDB database regression test suite (metapackage depending on th
 
 Package: mariadb-tokudb-engine-5.5
 Section: database
-Architecture: all
+Architecture: any
 Depends: mariadb-server-5.5
 Description: TokuDB storage engine for MariaDB
  TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC

debian/dist/Ubuntu/control

@@ -14,7 +14,7 @@ Package: libmariadbclient18
 Section: libs
 Architecture: any
 Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mariadb-server-5.5 (<< 5.5.32)
+Conflicts: mariadb-server-5.5 (<< 5.5.33)
 Description: MariaDB database client library
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -163,7 +163,7 @@ Architecture: any
 Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
 Conflicts: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
-    mariadb-server-5.5 (<< 5.5.32)
+    mariadb-server-5.5 (<< 5.5.33)
 Replaces: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3
 Description: MariaDB database regression test suite
@@ -234,7 +234,7 @@ Description: MariaDB database regression test suite (metapackage depending on th
 
 Package: mariadb-tokudb-engine-5.5
 Section: database
-Architecture: all
+Architecture: any
 Depends: mariadb-server-5.5
 Description: TokuDB storage engine for MariaDB
  TokuDB is a highly scalable, zero maintenance downtime, ACID and MVCC