Additional name fixes.

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

@@ -46,7 +46,7 @@ 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/doc/mariadb-galera-server-5.5/README-wsrep
-usr/share/lintian/overrides/mariadb-server-5.5
+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/Debian/rules

@@ -166,11 +166,11 @@ install: build
 	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
 	install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
 
-	# mariadb-server
+	# mariadb-galera-server
 	install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
 	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* \
@@ -190,7 +190,7 @@ install: build
 
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
-	cp debian/mariadb-galera-server-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-5.5
+	cp debian/mariadb-galera-server-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-5.5
 
 	# For 5.0 -> 5.5 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \

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

@@ -48,7 +48,7 @@ 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/doc/mariadb-galera-server-5.5/README-wsrep
-usr/share/lintian/overrides/mariadb-server-5.5
+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/mariadb-server-5.5.py

@@ -20,7 +20,7 @@ def _add_my_conf_files(report, filename):
             continue
 
 def add_info(report):
-    attach_conffiles(report, 'mariadb-server-5.5', conffiles=None)
+    attach_conffiles(report, 'mariadb-galera-server-5.5', conffiles=None)
     key = 'Logs' + path_to_key('/var/log/daemon.log')
     report[key] = ""
     for line in read_file('/var/log/daemon.log').split('\n'):

debian/dist/Ubuntu/rules

@@ -166,7 +166,7 @@ install: build
 	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
 	install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
 
-	# mariadb-server
+	# mariadb-galera-server
 	install -m 0755 $(BUILDDIR)/scripts/mysqld_safe $(TMP)/usr/bin/mysqld_safe
 	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)
@@ -190,7 +190,7 @@ install: build
 
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
-	cp debian/mariadb-galera-server-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-server-5.5
+	cp debian/mariadb-galera-server-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-5.5
 
 	# For 5.0 -> 5.5 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
@@ -202,7 +202,7 @@ install: build
 	# install AppArmor profile
 	install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
 	# install Apport hook
-	install -D -m 644 debian/mariadb-server-5.5.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-5.5.py
+	install -D -m 644 debian/mariadb-galera-server-5.5.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-5.5.py
 
 	autorm=debian/autorm-file;                                      \
 	rm -f $$autorm;                                                 \