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/popt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/popt/Makefile') diff --git a/package/popt/Makefile b/package/popt/Makefile index e30d95792..0d6cc551a 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= popt PKG_VERSION:= 1.16 PKG_RELEASE:= 4 PKG_MD5SUM:= 3743beefa3dd6247a73f8f7a32c14c33 -PKG_DESCR:= a command line option parsing library -PKG_SECTION:= libs +PKG_DESCR:= command line option parsing library +PKG_SECTION:= libs/misc PKG_BUILDDEP:= libiconv-tiny PKG_URL:= http://rpm5.org/ PKG_SITES:= http://rpm5.org/files/popt/ -- cgit v1.2.3