summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Manfredi2015-06-11 00:15:34 -0300
committerFernando Manfredi2015-06-11 00:15:34 -0300
commitc634c559725cc3b4f45e7e6e9947ffde73d35f3c (patch)
tree91e52a1894e50611cfca29c46cf90b46979affd0
parentb68e9b16f0b4d6ffa87631c71fbb7b65b33e273d (diff)
downloadaur-c634c559725cc3b4f45e7e6e9947ffde73d35f3c.tar.gz
Update conflicts due new 'nullidentdmod' release package
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 51a9a5da0853..2048033c6060 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,6 +8,7 @@ pkgbase = nullidentdmod-git
conflicts = oidentd
conflicts = nullidentd
conflicts = pindetd
+ conflicts = nullidentdmod
source = git+https://github.com/BlackXT/nullidentdmod
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a1d30e930588..dd1584cc5446 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=nullidentdmod-git
pkgver=20150610.22.c3f0e54
pkgrel=1
pkgdesc="Minimal identd server with customizable userid"
-conflicts=('oidentd' 'nullidentd' 'pindetd')
+conflicts=('oidentd' 'nullidentd' 'pindetd' 'nullidentdmod')
arch=('any')
url="http://web.craft.net.br/NullidentdMod/"
license=('GPL')