From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/bluez/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/bluez') diff --git a/package/bluez/Makefile b/package/bluez/Makefile index b4bc70410..e2bdec773 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 5d37e581107b3d6f91b81194a5006407 PKG_DESCR:= bluetooth applications PKG_SECTION:= wifi -PKG_DEPENDS:= kmod-bt glib dbus libreadline +PKG_DEPENDS:= glib dbus libreadline PKG_BUILDDEP:= autotool glib dbus readline PKG_URL:= http://www.bluez.org/ PKG_SITES:= http://mirror.anl.gov/pub/linux/bluetooth/ -- cgit v1.2.3