From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/forked-daapd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/forked-daapd/Makefile') diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile index 5b727c004..330500d9b 100644 --- a/package/forked-daapd/Makefile +++ b/package/forked-daapd/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= forked-daapd PKG_VERSION:= 0.19 PKG_RELEASE:= 1 PKG_MD5SUM:= 53e6f1d6683e3275e7c7698ec923a97e -PKG_DESCR:= DAAPD server -PKG_SECTION:= multimedia +PKG_DESCR:= daapd server +PKG_SECTION:= mm/audio PKG_DEPENDS:= libunistring zlib libconfuse sqlite libffmpeg libgcrypt PKG_DEPENDS+= libavahi libmxml libevent libavl libantlr3c alsa-lib PKG_DEPENDS+= libsqlite libintl dbus -- cgit v1.2.3