From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/openct/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/openct')

diff --git a/package/openct/Makefile b/package/openct/Makefile
index e14ea22eb..cf3f04d34 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		0.6.20
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		a1da3358ab798f1cb9232f1dbababc21
 PKG_DESCR:=		drivers for smart card readers
-PKG_SECTION:=		crypto
+PKG_SECTION:=		app/crypto
 PKG_DEPENDS:=		libopenct
 PKG_BUILDDEP:=		libtool
 PKG_URL:=		http://www.opensc-project.org/openct/
@@ -20,7 +20,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		OPENCT LIBOPENCT
 PKGSD_LIBOPENCT:=	crypto token library 
-PKGSC_LIBOPENCT:=	libs
+PKGSC_LIBOPENCT:=	libs/crypto
 PKGSS_LIBOPENCT:=	libltdl libusb
 PKGSB_LIBOPENCT:=	libtool libusb
 
-- 
cgit v1.2.3