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/libgcrypt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libgcrypt') diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 4e31b3370..1df7b4735 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libgcrypt PKG_VERSION:= 1.6.1 PKG_RELEASE:= 1 PKG_MD5SUM:= d155aa1b06fa879175922ba28f6a6509 -PKG_DESCR:= GNU crypto library -PKG_SECTION:= libs +PKG_DESCR:= crypto library +PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error PKG_BUILDDEP:= libgpg-error PKG_URL:= http://directory.fsf.org/project/libgcrypt -- cgit v1.2.3