summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a9abc32630e6..9e3fe44bfd6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
pkgbase = batman-adv-dkms-git
pkgdesc = batman kernel module (dkms package)
- pkgver = v2017.4.26.g8eea9c05
+ pkgver = v2017.4.35.g66a1f2a9
pkgrel = 1
url = https://www.open-mesh.org/projects/batman-adv
arch = any
license = GPL
depends = dkms
provides = batman-adv
+ conflicts = batman-adv-dkms
source = batman-adv::git+https://git.open-mesh.org/batman-adv.git#branch=master
source = dkms.conf
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a79ecd1292dd..b1d886bf21cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
pkgname=batman-adv-dkms-git
-pkgver=v2017.4.26.g8eea9c05
+pkgver=v2017.4.35.g66a1f2a9
pkgrel=1
pkgdesc='batman kernel module (dkms package)'
arch=('any')
provides=('batman-adv')
+conflicts=('batman-adv-dkms')
url='https://www.open-mesh.org/projects/batman-adv'
license=('GPL')
source=(