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/ccid/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/ccid') diff --git a/package/ccid/Makefile b/package/ccid/Makefile index ec48810ea..e4dfca7f0 100644 --- a/package/ccid/Makefile +++ b/package/ccid/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= ccid PKG_VERSION:= 1.4.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 79ef91103bcdd99a3b31cb5c5721a829 -PKG_DESCR:= a generic USB CCID and ICCD driver -PKG_SECTION:= crypto +PKG_DESCR:= generic usb ccid and iccd driver +PKG_SECTION:= app/crypto PKG_BUILDDEP:= pcsc-lite PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html PKG_SITES:= http://openadk.org/distfiles/ -- cgit v1.2.3