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/gmediaserver/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/gmediaserver') diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index ab5ed4a50..e5d93df74 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= gmediaserver PKG_VERSION:= 0.13.0 PKG_RELEASE:= 2 PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3 -PKG_DESCR:= UPnP music media server -PKG_SECTION:= multimedia +PKG_DESCR:= media server +PKG_SECTION:= mm/video PKG_DEPENDS:= id3lib libupnp libmagic PKG_BUILDDEP:= id3lib libupnp file libiconv-tiny PKG_URL:= http://www.gnu.org/software/gmediaserver -- cgit v1.2.3