summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@kekalainen.net>2019-07-26 18:36:42 -0300
committerOtto Kekäläinen <otto@kekalainen.net>2019-09-18 16:11:49 +0300
commit97cd583df7f118673bf28a9afaffe5dafcd1b4e9 (patch)
tree963a912662ec8260b61d6ebccbcc646bb64742e5
parentffd36093f189a0b7379db7c157b18d0184faba8f (diff)
downloadmariadb-git-97cd583df7f118673bf28a9afaffe5dafcd1b4e9.tar.gz
Deb: Sync non-functional changes from official Debian 10.4 packaging
- Update comment strings - Extend package description to satisfy Lintian complaint - Remove uscan stanza from rules as it is never used anyway
-rwxr-xr-xdebian/additions/debian-start1
-rw-r--r--debian/control2
-rw-r--r--debian/libmariadb-dev.README.Maintainer3
-rwxr-xr-xdebian/rules3
4 files changed, 6 insertions, 3 deletions
diff --git a/debian/additions/debian-start b/debian/additions/debian-start
index 7940bbe68a5..7de59ce1fe9 100755
--- a/debian/additions/debian-start
+++ b/debian/additions/debian-start
@@ -15,6 +15,7 @@ fi
MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf"
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
+# Don't run full mysql_upgrade on every server restart, use --version-check to do it only once
MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check"
MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf"
MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables"
diff --git a/debian/control b/debian/control
index e6b23f9f8ce..c433dd3f892 100644
--- a/debian/control
+++ b/debian/control
@@ -718,6 +718,8 @@ Depends: libcrack2 (>= 2.9.0),
Description: CrackLib Password Validation Plugin for MariaDB
This password validation plugin uses cracklib to allow only
sufficiently secure (as defined by cracklib) user passwords in MariaDB.
+ .
+ Install and configure this to enforce stronger passwords for MariaDB users.
Package: mariadb-test
Architecture: any
diff --git a/debian/libmariadb-dev.README.Maintainer b/debian/libmariadb-dev.README.Maintainer
index 99e1c662c14..40942827d63 100644
--- a/debian/libmariadb-dev.README.Maintainer
+++ b/debian/libmariadb-dev.README.Maintainer
@@ -1,3 +1,6 @@
The examples directory includes files that might be needed by some
developers:
- the example file udf_example.c
+
+For more information, see MariaDB Connector/C docs at:
+https://github.com/MariaDB/mariadb-connector-c/wiki/libmysql_libmariadb
diff --git a/debian/rules b/debian/rules
index ae6091f2e96..9914bae721b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -163,9 +163,6 @@ override_dh_installinit-arch:
override_dh_installcron-arch:
dh_installcron --name mysql-server
-get-orig-source:
- uscan --force-download --verbose
-
# If a file is not supposed to be included anywhere, add it to the not-installed
# file and document the reason. Note that dh_install supports the above mentioned
# white list file only starting from Debian Stretch and Ubuntu Xenial.