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/v4l-utils/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/v4l-utils')

diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index 64e500858..814489b8a 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		v4l-utils
 PKG_VERSION:=		1.0.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2127f2d06be9162b0d346f7037a9e852
-PKG_DESCR:=		Video4Linux2 utilities
-PKG_SECTION:=		multimedia
+PKG_DESCR:=		video4linux utilities
+PKG_SECTION:=		mm/video
 PKG_BUILDDEP:=		libjpeg-turbo
 PKG_SITES:=		http://linuxtv.org/downloads/v4l-utils/
 PKG_LIBNAME:=		libv4l
@@ -18,7 +18,7 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 PKG_LIBC_DEPENDS:=	glibc
 PKG_SUBPKGS:=		V4L_UTILS LIBV4L
-PKGSC_LIBV4L:=		libs
+PKGSC_LIBV4L:=		libs/video
 PKGSD_LIBV4L:=		Video4Linux2 libraries
 
 ifeq ($(ADK_STATIC),y)
-- 
cgit v1.2.3