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/serdisplib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/serdisplib') diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile index 07f83db34..f7374d9ef 100644 --- a/package/serdisplib/Makefile +++ b/package/serdisplib/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= serdisplib PKG_VERSION:= 1.97.8 PKG_RELEASE:= 1 PKG_MD5SUM:= 2aa91c43d01d2dfc9fbc1116e3063ae1 -PKG_DESCR:= display drivers (serial, parallel, USB) -PKG_SECTION:= serial +PKG_DESCR:= display drivers (serial, parallel, usb) +PKG_SECTION:= sys/serial PKG_DEPENDS:= libusb-compat PKG_BUILDDEP:= libgd libusb-compat PKG_URL:= http://serdisplib.sourceforge.net -- cgit v1.2.3