summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnathan Jenkins2015-12-04 05:51:32 -0800
committerJohnathan Jenkins2015-12-04 05:51:32 -0800
commit3b0113b8ed33e751aeba4afe3ec6ee32d66d4ed9 (patch)
treeba6d4c78b9f0781063b2cdf043c6fc6afc349fae
parentb712b83ef01106ff7a8cbf25c47e1fc12f8a513a (diff)
downloadaur-3b0113b8ed33e751aeba4afe3ec6ee32d66d4ed9.tar.gz
add conflict with colormake
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 385134db042a..d7d84b81bce9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,6 +8,7 @@ pkgbase = colormake-git
license = GPL
makedepends = git
depends = perl
+ conflicts = colormake
source = colormake-git::git+https://github.com/pagekite/Colormake.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6cc007dd37e9..a2d5c183f492 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,6 +8,7 @@ pkgdesc="A simple wrapper around make to make it's output more readable"
arch=('i686' 'x86_64')
url="https://github.com/pagekite/Colormake"
license=('GPL')
+conflicts=('colormake')
depends=('perl')
makedepends=('git')
source=("${pkgname}::git+https://github.com/pagekite/Colormake.git")