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/log4cxx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/log4cxx') diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile index fd2dedb70..3d60eb4a7 100644 --- a/package/log4cxx/Makefile +++ b/package/log4cxx/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= log4cxx PKG_VERSION:= 0.10.0 PKG_RELEASE:= 2 PKG_MD5SUM:= b30ffb8da3665178e68940ff7a61084c -PKG_DESCR:= Apache logging framework for C++ -PKG_SECTION:= libs +PKG_DESCR:= apache logging framework for c++ +PKG_SECTION:= libs/misc PKG_DEPENDS:= apr apr-util PKG_BUILDDEP:= apr apr-util PKG_URL:= http://logging.apache.org/log4cxx/ -- cgit v1.2.3