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/daq/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/daq/Makefile') diff --git a/package/daq/Makefile b/package/daq/Makefile index 61a50e2cd..dfc58725d 100644 --- a/package/daq/Makefile +++ b/package/daq/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= daq PKG_VERSION:= 2.0.0 PKG_RELEASE:= 4 PKG_MD5SUM:= a00855a153647df76d47f1ea454f74ae -PKG_DESCR:= daq -PKG_SECTION:= libs +PKG_DESCR:= data acquisition library +PKG_SECTION:= libs/misc PKG_DEPENDS:= libpcap libdnet PKG_BUILDDEP:= libpcap libdnet autotool PKG_URL:= http://www.snort.org -- cgit v1.2.3