diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-10 10:24:53 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-10 10:24:53 +0100 |
| commit | 61da6ed883804e3fb97bc1ad314585a52383cf4c (patch) | |
| tree | de51a9925d95f31c897f841aeb0d8fa075b1461d /extra/mariadb | |
| parent | 0a353bad57296d34a69b3df25e53a6b00d3bd369 (diff) | |
| parent | 6ee08d6a9217906f2ef84f70923d3d362d4b40ad (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/luajit/PKGBUILD
extra/speech-dispatcher/PKGBUILD
extra/xine-lib/PKGBUILD
libre/cups-filters-libre/PKGBUILD
libre/file-roller-libre/PKGBUILD
Diffstat (limited to 'extra/mariadb')
| -rw-r--r-- | extra/mariadb/PKGBUILD | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 7eaa19def..ea0060806 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179120 2013-03-03 20:01:04Z bpiotrowski $ +# $Id: PKGBUILD 179729 2013-03-09 15:29:21Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.29 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') license=('GPL') url='http://mariadb.org/' @@ -107,9 +107,10 @@ package_mariadb() { backup=('etc/mysql/my.cnf') install=mariadb.install depends=('mariadb-clients') - conflicts=('mysql') - provides=("mysql=$pkgver") - optdepends=('perl-dbi' 'perl-dbd-mysql') + conflicts=('mysql' 'mytop') + provides=("mysql=$pkgver" 'mytop') + optdepends=('perl-dbd-mysql: mytop dependency' + 'perl-term-readkey: mytop dependency') options=('emptydirs') cd "$srcdir"/build |