diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/forked-daapd | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/forked-daapd')
| -rw-r--r-- | package/forked-daapd/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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 |