From 24ed9d53c369b2599cf10a923d072d9e9f0dde97 Mon Sep 17 00:00:00 2001
From: Enno Boland <eb@s01.de>
Date: Mon, 2 Feb 2015 12:37:00 +0100
Subject: [PATCH] batman-adv14: conflicts with batman-adv

---
 srcpkgs/batman-adv14/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/batman-adv14/template b/srcpkgs/batman-adv14/template
index e4920db5f99..2ca638ff06f 100644
--- a/srcpkgs/batman-adv14/template
+++ b/srcpkgs/batman-adv14/template
@@ -1,7 +1,7 @@
 # Template file for 'batman-adv14'
 pkgname=batman-adv14
 version=2013.4.0
-revision=4
+revision=5
 short_desc="B.A.T.M.A.N. routing protocol kernel module (protocol version 14)"
 maintainer="Enno Boland <eb@s01.de>"
 license="GPL-2"
@@ -10,6 +10,8 @@ distfiles="http://downloads.open-mesh.org/batman/releases/batman-adv-${version}/
 checksum=a9b1b7542c94cc6bf7c97b7b0d02bf071b5632a64480ae419358b9cb9cab6870
 conflicts="batman-adv>=0"
 wrksrc="batman-adv-$version"
+provides="batman-adv-$version_$revision"
+conflicts="batman-adv"
 
 triggers="dkms"
 dkms_modules="batman-adv14 ${version}"