summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-01-21 08:34:19 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-01-21 08:34:19 +0200
commitacc4da9c18fe84e419254f0130416a654b152ed2 (patch)
treeef8d8ed9cba0bd1a1926d89aa6771beb73698938
parentf52bf92014efae6a1da9c2f26a7e3792ed5f5396 (diff)
downloadmariadb-git-acc4da9c18fe84e419254f0130416a654b152ed2.tar.gz
After-merge fix
The merge commit ded128aa9b3d40775e626a08a744a93d9ba71b01 failed to adjust commit 9d18b6246755472c8324bf3e20e234e08ac45618 in debian/rules. We must adjust the build path, which is derived from the package name, which contains the major version number.
-rwxr-xr-xdebian/rules4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules
index ace36e43cb0..0370a753d2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,8 +148,8 @@ endif
override_dh_fixperms:
dh_fixperms
- chmod 04755 debian/mariadb-server-10.4/usr/lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
- chmod 0700 debian/mariadb-server-10.4/usr/lib/mysql/plugin/auth_pam_tool_dir
+ chmod 04755 debian/mariadb-server-10.5/usr/lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
+ chmod 0700 debian/mariadb-server-10.5/usr/lib/mysql/plugin/auth_pam_tool_dir
override_dh_installlogrotate-arch:
dh_installlogrotate --name mysql-server