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/siproxd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/siproxd/Makefile') diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile index 6375cb286..1c7e81d5e 100644 --- a/package/siproxd/Makefile +++ b/package/siproxd/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= siproxd PKG_VERSION:= 0.8.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 1a6f9d13aeb2d650375c9a346ac6cbaf -PKG_DESCR:= SIP (Session Initiation Protocol) proxy -PKG_SECTION:= proxy +PKG_DESCR:= session initiation protocol proxy +PKG_SECTION:= net/voip PKG_DEPENDS:= libosip2 libpthread PKG_BUILDDEP:= autotool libosip2 PKG_URL:= http://siproxd.sourceforge.net -- cgit v1.2.3