summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-12-19 10:46:33 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-12-19 10:46:33 +0000
commitb505fe12ce6b0c520cc4854b1b9633e1228ec895 (patch)
tree24c3c7226f20a0efae089e7470738e169f795376
parent78f8364f4f55c30e80be52f99630eee854944b7f (diff)
downloadaports-b505fe12ce6b0c520cc4854b1b9633e1228ec895.tar.bz2
aports-b505fe12ce6b0c520cc4854b1b9633e1228ec895.tar.xz
testing/obexd: add conflict for obex-data-server
-rw-r--r--testing/obexd/APKBUILD5
1 files changed, 3 insertions, 2 deletions
diff --git a/testing/obexd/APKBUILD b/testing/obexd/APKBUILD
index 64913477c..acc2ef5c3 100644
--- a/testing/obexd/APKBUILD
+++ b/testing/obexd/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=obexd
pkgver=0.37
-pkgrel=1
+pkgrel=2
pkgdesc="D-Bus service for Obex Server"
url="http://www.bluez.org/"
arch="x86 x86_64"
license="GPL2"
-depends=
+depends="!obex-data-server"
subpackages="$pkgname-client"
makedepends="dbus-glib-dev openobex-dev glib-dev bluez-dev libical-dev"
source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2"
@@ -35,6 +35,7 @@ _mv_files() {
client() {
pkgdesc="D-Bus service for Obex Client access"
+ depends=
cd "$pkgdir"
_mv_files usr/lib/obexd/obex-client \
usr/share/dbus-*/services/obex-client.service