summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorprocrastinator2015-06-27 18:35:30 +0100
committerprocrastinator2015-06-27 18:35:30 +0100
commitb1d4e3acdc9454628429907f4670a341f1753abb (patch)
tree9ec1f0a83642631964d0fda798f9c8a1597b441e
parent25e7b2115db8f26aeaf5dfc16401b66c80ceb39d (diff)
downloadaur-b1d4e3acdc9454628429907f4670a341f1753abb.tar.gz
Add gyazo-git as conflict
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD1
2 files changed, 3 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7885b5617a52..14a0eb2c9e20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by makepkg 4.2.1
-# Sun Jun 7 00:12:36 UTC 2015
+# Sat Jun 27 17:33:44 UTC 2015
pkgbase = gyazo
pkgdesc = Launch the Gyazo app and drag your mouse to grab the screen.
pkgver = 1.0_1
@@ -11,6 +11,7 @@ pkgbase = gyazo
depends = ruby
depends = xclip
depends = imagemagick
+ conflicts = gyazo-git
source = https://github.com/gyazo/Gyazo-for-Linux/archive/master.zip
sha256sums = 58567d7c2a77bae20551c66d203385b64037df7599f431c92f66e3aafe4a6b3f
diff --git a/PKGBUILD b/PKGBUILD
index 83d0623d2818..ccdcbdd2eb59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,6 +9,7 @@ url="http://gyazo.com/"
license=('GPL')
groups=(multimedia)
depends=('ruby' 'xclip' 'imagemagick')
+conflicts=('gyazo-git')
source=("https://github.com/gyazo/Gyazo-for-Linux/archive/master.zip")
sha256sums=('58567d7c2a77bae20551c66d203385b64037df7599f431c92f66e3aafe4a6b3f')