Add heirloom-sh to the conflicts array.

2 files changed, 5 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1da9219119b4..8a52305c2e2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Apr 14 14:12:25 UTC 2016
+# Thu Dec 29 05:02:54 UTC 2016
 pkgbase = heirloom-sh-cvs
 	pkgdesc = A portable variant of the traditional Unix shell, implements the SVR4/SVID3 level of the shell.
 	pkgver = 2011.06.22
-	pkgrel = 2
+	pkgrel = 3
 	url = http://heirloom.sourceforge.net/sh.html
 	arch = i686
 	arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = heirloom-sh-cvs
 	makedepends = cvs
 	provides = sh
 	provides = heirloom-sh
+	conflicts = heirloom-sh
 	replaces = heirloom-sh
 	source = 000-config.diff
 	md5sums = 991b32bee780ce48685dfd4d39d41443
diff --git a/PKGBUILD b/PKGBUILD
index dca6c939f966..d29e2336464e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer: aksr <aksr at t-com dot me>
 pkgname=heirloom-sh-cvs
 pkgver=2011.06.22
-pkgrel=2
+pkgrel=3
 pkgdesc="A portable variant of the traditional Unix shell, implements the SVR4/SVID3 level of the shell."
 arch=('i686' 'x86_64')
 url="http://heirloom.sourceforge.net/sh.html"
@@ -13,7 +13,7 @@ license=('custom:"caldera"' 'custom:"opensolaris"')
 provides=('sh' 'heirloom-sh')
 replaces=('heirloom-sh')
 makedepends=('cvs')
-conflicts=()
+conflicts=('heirloom-sh')
 source=('000-config.diff')
 md5sums=('991b32bee780ce48685dfd4d39d41443')
 sha1sums=('0119962358fce0b5ba88eab750d1ef2d91402428')