From ba688f7bf40ae3b544b2f6d20ecdf53753c255cc Mon Sep 17 00:00:00 2001
From: Samir <ram-z@chakra-project.org>
Date: Sun, 29 Jul 2012 20:32:51 +0000
Subject: [PATCH] fix conflicts

---
 lib32-v4l-utils/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib32-v4l-utils/PKGBUILD b/lib32-v4l-utils/PKGBUILD
index c56dd45..128cc2c 100644
--- a/lib32-v4l-utils/PKGBUILD
+++ b/lib32-v4l-utils/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgbasename=v4l-utils
 pkgname=lib32-$_pkgbasename
 pkgver=0.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools and conversion library for Video 4 Linux (32-bit)"
 arch=('x86_64')
 url="http://freshmeat.net/projects/libv4l"
@@ -34,5 +34,5 @@ build() {
 package() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
   make install PREFIX=/usr LIBDIR=/usr/lib32 DESTDIR="${pkgdir}/"
-  rm -rf "${pkgdir}"/usr/{include,share,bin,sbin}
+  rm -rf "${pkgdir}"/{etc,lib,usr/{include,share,bin,sbin}}
 }