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/cryptsetup/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/cryptsetup') diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 2e9d42f78..234e0eef0 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= cryptsetup PKG_VERSION:= 1.6.3 PKG_RELEASE:= 1 PKG_MD5SUM:= a7aeb549a543eeac433eadfb6bc67837 -PKG_DESCR:= LUKS cryptsetup tools -PKG_SECTION:= crypto +PKG_DESCR:= utility used to conveniently setup disk encryption +PKG_SECTION:= app/crypto PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm -- cgit v1.2.3