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/ca-certificates/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/ca-certificates/Makefile') diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile index 4eeacf740..7994bea2c 100644 --- a/package/ca-certificates/Makefile +++ b/package/ca-certificates/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= ca-certificates PKG_VERSION:= 20090814 PKG_RELEASE:= 3 PKG_MD5SUM:= 307052c985bec7f9a00eb84293eef779 -PKG_DESCR:= Collection of common CA certificates -PKG_SECTION:= net/security +PKG_DESCR:= collection of common ca certificates +PKG_SECTION:= app/crypto PKG_DEPENDS:= openssl-util libopenssl PKG_URL:= http://packages.debian.org/sid/ca-certificates PKG_SITES:= http://ftp.debian.org/debian/pool/main/c/ca-certificates/ @@ -16,7 +16,7 @@ PKG_SITES:= http://ftp.debian.org/debian/pool/main/c/ca-certificates/ DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz PKG_FLAVOURS_CA_CERTS:= SMALL -PKGFD_SMALL:= Minimal set of CA certificates +PKGFD_SMALL:= minimal set of CA certificates include $(TOPDIR)/mk/package.mk -- cgit v1.2.3