diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-21 01:12:38 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-21 01:12:38 -0300 |
commit | 62130de96451044ea587d1cef2302c4cf3f910c4 (patch) | |
tree | 7ab5036739c0b7c3aa0ac787287b38652f1bcffb /extra/obexd | |
parent | 46d785933a49b1f2d742ca828f7b12c6a9a9d401 (diff) | |
parent | 6d22541bcebb7236bedfb98a96d5a1292072e86c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vhba-module/60-vhba.rules
community-testing/vhba-module/PKGBUILD
community-testing/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/gzip/PKGBUILD
core/logrotate/PKGBUILD
extra/bluez/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/libtool-multilib/PKGBUILD
Diffstat (limited to 'extra/obexd')
-rw-r--r-- | extra/obexd/PKGBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD index cfe36e078..daa218742 100644 --- a/extra/obexd/PKGBUILD +++ b/extra/obexd/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 157964 2012-04-30 07:31:43Z andrea $ +# $Id: PKGBUILD 162046 2012-06-19 06:07:57Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgbase=obexd pkgname=('obexd-client' 'obexd-server') -pkgver=0.45 +pkgver=0.46 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -makedepends=('glib2' 'openobex' 'libical') +makedepends=('glib2' 'bluez' 'libical') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('2aa178fe9b257fd637559608e72bb665') +md5sums=('625f0417d119437429c9cce29479cfa4') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -23,7 +23,7 @@ build() { package_obexd-client() { pkgdesc="D-Bus service providing high-level OBEX client side functionality" - depends=('openobex' 'glib2') + depends=('bluez' 'glib2') provides=("obexd=${pkgver}") replaces=('obexd') conflicts=('obexd') @@ -37,7 +37,7 @@ package_obexd-client() { package_obexd-server() { pkgdesc="D-Bus service providing high-level OBEX server side functionality" - depends=('openobex' 'glib2' 'libical') + depends=('bluez' 'glib2' 'libical') conflicts=('obex-data-server') cd "${srcdir}/${pkgbase}-${pkgver}/src" |