diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-04 09:51:11 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-04 09:51:11 +0100 |
commit | 6b67b8c583b321bc955bc8efd24befe40d15e9fc (patch) | |
tree | 61148cd550443788030ce27e3d7bee9fb9daf57e /extra/mariadb | |
parent | 8ba6ee51e836f2a5b78c7d6ca0096ddb5f847833 (diff) | |
parent | 3a8d026e8e859ff4c9aa813d5f1eb2afa5663e78 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang-sdl/PKGBUILD
community/nautilus-sound-converter/PKGBUILD
community/shapelib/PKGBUILD
core/libarchive/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/evince/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/libgxps/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/qt5/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
libre/kernel26-libre-lts/PKGBUILD
Diffstat (limited to 'extra/mariadb')
-rw-r--r-- | extra/mariadb/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/mariadb/mariadb.install | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 9678abd12..7eaa19def 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179064 2013-03-02 21:39:03Z bpiotrowski $ +# $Id: PKGBUILD 179120 2013-03-03 20:01:04Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.29 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('GPL') url='http://mariadb.org/' @@ -65,7 +65,7 @@ build() { } package_libmariadbclient() { - pkgdesc="MariaDB client libraries" + pkgdesc='MariaDB client libraries' depends=('openssl') conflicts=('libmysqlclient') provides=("libmysqlclient=$pkgver") @@ -84,7 +84,7 @@ package_libmariadbclient() { } package_mariadb-clients() { - pkgdesc="MariaDB client tools" + pkgdesc='MariaDB client tools' depends=('libmariadbclient') conflicts=('mysql-clients') provides=("mysql-clients=$pkgver") @@ -103,7 +103,7 @@ package_mariadb-clients() { } package_mariadb() { - pkgdesc="A fast SQL database server, drop-in replacement for MySQL" + pkgdesc='Fast SQL database server, drop-in replacement for MySQL' backup=('etc/mysql/my.cnf') install=mariadb.install depends=('mariadb-clients') diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install index de619b668..c99114c07 100644 --- a/extra/mariadb/mariadb.install +++ b/extra/mariadb/mariadb.install @@ -14,6 +14,9 @@ post_install(){ fi usr/bin/systemd-tmpfiles --create mysqld.conf + + echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'" + echo " after mysqld.service restart." } post_upgrade(){ @@ -28,7 +31,7 @@ post_upgrade(){ fi if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then - echo ">>> mysql.service has been renamed to mysqld.service to keep" + echo ">> mysql.service has been renamed to mysqld.service to keep" echo " consistency with MySQL package." fi } |