MDEV-5423: Debian MariaDB-Galera packages do not get built in buildbot [Part 2]

Fix: Server name is mariadb-galera-5.5

debian/dist/Debian/mariadb-galera-server-5.5.dirs

@@ -5,7 +5,7 @@ usr/bin
 usr/sbin
 usr/share/man/man8
 usr/share/mysql
-usr/share/doc/mariadb-server-5.5
+usr/share/doc/mariadb-galera-server-5.5
 usr/support-files
 var/run/mysqld
 var/lib/mysql-upgrade

debian/dist/Debian/mariadb-galera-server-5.5.files.in

@@ -37,9 +37,9 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/share/doc/mariadb-server-5.5/mysqld.sym.gz
-usr/share/doc/mariadb-server-5.5/INFO_SRC
-usr/share/doc/mariadb-server-5.5/INFO_BIN
+usr/share/doc/mariadb-galera-server-5.5/mysqld.sym.gz
+usr/share/doc/mariadb-galera-server-5.5/INFO_SRC
+usr/share/doc/mariadb-galera-server-5.5/INFO_BIN
 usr/share/lintian/overrides/mariadb-server-5.5
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1

debian/dist/Debian/rules

@@ -168,7 +168,7 @@ install: build
 
 	# mariadb-server
 	install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
-	mkdir -p $(TMP)/usr/share/doc/mariadb-server-5.5/examples
+	mkdir -p $(TMP)/usr/share/doc/mariadb-galera-server-5.5/examples
 	# We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf)
 	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-server-5.5/examples/
 	rm -vf $(TMP)/usr/share/mysql/my-*.cnf \
@@ -182,8 +182,8 @@ install: build
 	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
 	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
 
-	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_SRC
-	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN
+	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-galera-server-5.5/INFO_SRC
+	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-galera-server-5.5/INFO_BIN
 
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test	$(TMP)/usr/share/mysql

debian/dist/Ubuntu/mariadb-galera-server-5.5.dirs

@@ -5,7 +5,7 @@ usr/bin
 usr/sbin
 usr/share/man/man8
 usr/share/mysql
-usr/share/doc/mariadb-server-5.5
+usr/share/doc/mariadb-galera-server-5.5
 usr/support-files
 var/run/mysqld
 var/lib/mysql-upgrade

debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in

@@ -39,10 +39,10 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
-usr/share/doc/mariadb-server-5.5/mysqld.sym.gz
-usr/share/doc/mariadb-server-5.5/INFO_SRC
-usr/share/doc/mariadb-server-5.5/INFO_BIN
-usr/share/lintian/overrides/mariadb-server-5.5
+usr/share/doc/mariadb-galera-server-5.5/mysqld.sym.gz
+usr/share/doc/mariadb-galera-server-5.5/INFO_SRC
+usr/share/doc/mariadb-galera-server-5.5/INFO_BIN
+usr/share/lintian/overrides/mariadb-galera-server-5.5
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
 usr/share/man/man1/myisam_ftdump.1

debian/dist/Ubuntu/rules

@@ -168,9 +168,9 @@ install: build
 
 	# mariadb-server
 	install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
-	mkdir -p $(TMP)/usr/share/doc/mariadb-server-5.5/examples
+	mkdir -p $(TMP)/usr/share/doc/mariadb-galera-server-5.5/examples
 	# We have a sane my.cnf, cruft not needed (remove my-*.cnf and config-*.cnf)
-	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-server-5.5/examples/
+	#  $(TMP)/usr/share/mysql/*cnf      $(TMP)/usr/share/doc/mariadb-galera-server-5.5/examples/
 	rm -vf $(TMP)/usr/share/mysql/my-*.cnf \
 	       $(TMP)/usr/share/mysql/config-*.cnf \
 	       $(TMP)/usr/share/mysql/mi_test_all* \
@@ -182,8 +182,8 @@ install: build
 	install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
 	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
 
-	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_SRC
-	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN
+	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-galera-server-5.5/INFO_SRC
+	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-galera-server-5.5/INFO_BIN
 
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test	$(TMP)/usr/share/mysql

storage/tokudb/CMakeLists.txt

@@ -16,7 +16,7 @@ ENDIF()
 
 ############################################
 SET(ENV{TOKUDB_VERSION} "7.0.4")
-SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md" PARENT_SCOPE)
+SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-galera-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-galera-server-5.5/README.md" PARENT_SCOPE)
 SET(USE_BDB OFF CACHE BOOL "")
 SET(USE_VALGRIND OFF CACHE BOOL "")
 SET(BUILD_TESTING  OFF CACHE BOOL "")