summaryrefslogtreecommitdiff
path: root/extra/mariadb
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-03-28 16:32:45 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-03-28 16:32:45 +0100
commite4421c38da95569f796d29c83a54f750e5222545 (patch)
tree3b7ac69f38e8a83d0dc58b69305011d095c5ceb0 /extra/mariadb
parent3ffe7613c97fecff8c5710dfbd44a984eaae9adc (diff)
parent0fbe25a10dce8ec16455854ed6929b688f98cb36 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/erlang/PKGBUILD community/haskell-x11-xft/PKGBUILD community/libgdamm/PKGBUILD community/luasql/PKGBUILD community/myodbc/PKGBUILD community/python2-basemap/PKGBUILD community/ruby-cairo/PKGBUILD community/ruby-gtk2/PKGBUILD community/stardict/PKGBUILD core/diffutils/PKGBUILD core/libsasl/PKGBUILD core/systemd/PKGBUILD extra/anjuta/PKGBUILD extra/ardour/PKGBUILD extra/boost/PKGBUILD extra/calligra/PKGBUILD extra/gnokii/PKGBUILD extra/icu/PKGBUILD extra/libgda/PKGBUILD extra/libmtp/PKGBUILD extra/lighttpd/PKGBUILD extra/mariadb/PKGBUILD extra/mysql/PKGBUILD extra/php/PKGBUILD extra/qt3/PKGBUILD extra/qt4/PKGBUILD extra/qt5/PKGBUILD extra/tracker/PKGBUILD extra/vlc/PKGBUILD extra/webkitgtk/PKGBUILD libre/lilo/PKGBUILD libre/psi/PKGBUILD
Diffstat (limited to 'extra/mariadb')
-rw-r--r--extra/mariadb/PKGBUILD4
-rw-r--r--extra/mariadb/mariadb.install2
2 files changed, 3 insertions, 3 deletions
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 87254eccb..2a10ef5b1 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180012 2013-03-14 18:21:32Z bpiotrowski $
+# $Id: PKGBUILD 180833 2013-03-26 15:59:12Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
pkgbase=mariadb
pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
pkgver=5.5.30
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url='http://mariadb.org/'
diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install
index c99114c07..7d3c2ce5c 100644
--- a/extra/mariadb/mariadb.install
+++ b/extra/mariadb/mariadb.install
@@ -13,7 +13,7 @@ post_install(){
chown -R mysql:mysql var/lib/mysql &>/dev/null
fi
- usr/bin/systemd-tmpfiles --create mysqld.conf
+ usr/bin/systemd-tmpfiles --create mysql.conf
echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'"
echo " after mysqld.service restart."