From e14775ae143dabf54452ae1089d7f22f3e1c1440 Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Sun, 1 Apr 2012 18:21:47 -0400 Subject: [PATCH] adding motion-noffmpeg conflicts with motion --- alarm/motion-noffmpeg/PKGBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alarm/motion-noffmpeg/PKGBUILD b/alarm/motion-noffmpeg/PKGBUILD index b4bb00c42..198d4b82b 100644 --- a/alarm/motion-noffmpeg/PKGBUILD +++ b/alarm/motion-noffmpeg/PKGBUILD @@ -5,8 +5,11 @@ _pkgbase='motion' pkgname=motion-noffmpeg pkgver=3.2.12 provides=('motion') +replaces=('motion') +conflicts=('motion') +makedepends=('libmysqlclient') pkgrel=3 -pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" +pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams, built with MySQL support, without FFMPEG, and requires fewer dependencies (~47MB -> ~3MB) " arch=('i686' 'x86_64') license=('GPL') url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"