Click here to go back to the commit logs for git-secret.

Commit:

---

Hash: a044a76bb5392dccfd7795fb0412fc03043eac85

Message: Updated conflicts

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index f921fef..95dbb12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,12 +3,14 @@ generated-by = makedeb-makepkg
 pkgbase = git-secret
 	pkgdesc = A bash-tool to store your private data inside a git repository
 	pkgver = 0.4.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/sobolevn/git-secret
 	arch = any
 	license = MIT
 	depends = git
 	depends = gnupg
+	conflicts = git-secret-git
+	conflicts = git-secret-bin
 	source = git+https://github.com/sobolevn/git-secret.git#tag=v0.4.0
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 7644d90..8d59219 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname="git-secret"
 _gitname="git-secret"
 pkgver="0.4.0"
-pkgrel="1"
+pkgrel="2"
 pkgdesc="A bash-tool to store your private data inside a git repository"
 arch=('any')
 url="https://github.com/sobolevn/git-secret"
@@ -14,6 +14,7 @@ license=('MIT')
 depends=('git' 'gnupg')
 source=("git+${url}.git#tag=v${pkgver}")
 sha256sums=('SKIP')
+conflicts=("${_gitname}-git" "${_gitname}-bin")
 
 build() {
     cd "${srcdir}/${_gitname}"