diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-20 18:59:44 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-20 18:59:44 +0100 |
| commit | 24ac25bb11036f62ff8c578c4d3e3dba5f3dbcef (patch) | |
| tree | 40446a0370c5278300dbabb70bcface64e7b64a9 /community/luasql | |
| parent | 27127b7917b98352703db59967e23688e07a5d24 (diff) | |
| parent | fecd6286e00e6e25458a7d1b8b80f6fdb236a7a2 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/instead/PKGBUILD
community/luasql/PKGBUILD
community/qtcreator/PKGBUILD
extra/dosfstools/PKGBUILD
Diffstat (limited to 'community/luasql')
| -rw-r--r-- | community/luasql/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/community/luasql/PKGBUILD b/community/luasql/PKGBUILD index eabd1833e..a52f2da10 100644 --- a/community/luasql/PKGBUILD +++ b/community/luasql/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81122 2012-12-12 00:49:33Z eric $ +# $Id: PKGBUILD 81397 2012-12-19 13:39:14Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sébastien Luttringer <seblu@archlinux.org> # Contributor: Anders Bergh <anders1@gmail.com> @@ -6,11 +6,10 @@ pkgbase=luasql pkgname=('lua-sql-mysql' 'lua-sql-postgres' 'lua-sql-sqlite') pkgver=2.2.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.keplerproject.org/luasql/' license=('MIT') -conflicts=('luasql-mysql') makedepends=('lua' 'libmysqlclient' 'postgresql-libs' 'sqlite') source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz" 'lua52.patch') @@ -32,6 +31,7 @@ build() { package_lua-sql-mysql() { pkgdesc='MySQL module for Lua' depends=('lua' 'libmysqlclient') + conflicts=('luasql-mysql') replaces=('luasql-mysql') cd $pkgbase-$pkgver |