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/heimdal/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'package/heimdal')
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 52ba4a1f4..56f407b35 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= heimdal
PKG_VERSION:= 1.5.3
PKG_RELEASE:= 1
PKG_MD5SUM:= 30b379e3de12f332fbd201131f02ffca
-PKG_DESCR:= kerberos 5 server
-PKG_SECTION:= crypto
+PKG_DESCR:= kerberos server
+PKG_SECTION:= app/crypto
PKG_BUILDDEP:= autotool openssl ncurses e2fsprogs readline heimdal-host
PKG_DEPENDS:= libheimdal libncurses libcom-err libreadline libopenssl
HOST_BUILDDEP:= bison-host
@@ -21,8 +21,8 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= HEIMDAL_SERVER LIBHEIMDAL
-PKGSD_LIBHEIMDAL:= kerberos 5 libraries
-PKGSC_LIBHEIMDAL:= libs
+PKGSD_LIBHEIMDAL:= kerberos libraries
+PKGSC_LIBHEIMDAL:= libs/crypto
PKG_FLAVOURS_HEIMDAL_SERVER:= WITH_PKINIT
PKGFD_WITH_PKINIT: Enable PK-INIT
--
cgit v1.2.3