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/setpwc/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'package/setpwc')

diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile
index becb813d6..2e7572008 100644
--- a/package/setpwc/Makefile
+++ b/package/setpwc/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		setpwc
 PKG_VERSION:=		1.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		79d5ee468c0076feb3cac473bef661d2
-PKG_DESCR:=		Philips (and compatibles) WebCams (PWC) control utility
-PKG_SECTION:=		multimedia
+PKG_DESCR:=		philips webcam control utility
+PKG_SECTION:=		sys/misc
 PKG_URL:=		http://www.vanheusden.com/setpwc/
 PKG_SITES:=		http://www.vanheusden.com/setpwc/
 
@@ -23,7 +23,6 @@ BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 
 TARGET_CPPFLAGS+=	-DVERSION=\"${PKG_VERSION}\"
-TARGET_CFLAGS+=		-Wall
 
 do-build:
 	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
-- 
cgit v1.2.3