summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2017-04-11 16:18:47 +0300
committerCaleb Maclennan2017-04-11 16:18:47 +0300
commitbdba626d1bca1eb3afb086caa82db9a5323d76a4 (patch)
treeea9e49b9f68d3ca732f186736d46c1fbecf37f02
parent016951c89a65980f6e6dee1bbc479e7bed3d0764 (diff)
downloadaur-bdba626d1bca1eb3afb086caa82db9a5323d76a4.tar.gz
Bump version and fix conflicts syntax
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f4d0e2c138b..05892f0071e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Apr 7 14:44:15 UTC 2017
+# Tue Apr 11 13:18:22 UTC 2017
pkgbase = mastodon-git
pkgdesc = A GNU Social-compatible microblogging server
- pkgver = 1.1_0_g4e41cd9a
+ pkgver = 1.1.1_29_gc35bda05
pkgrel = 0.1
url = https://mastodon.social
arch = i686
@@ -17,8 +17,8 @@ pkgbase = mastodon-git
depends = nodejs
depends = redis
depends = postgresql
- conflicts = mastodon,
- conflicts = mastodon-docker,
+ conflicts = mastodon
+ conflicts = mastodon-docker
conflicts = mastodon-docker-git
source = git://github.com/tootsuite/mastodon.git#branch=master
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index f65d7d2bd634..c8be59a8cb22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
# Maintainer: Caleb Maclennan <caleb@alerque.com>
pkgname=mastodon-git
-pkgver=1.1_0_g4e41cd9a
+pkgver=1.1.1_29_gc35bda05
_branch=master
pkgrel=0.1
pkgdesc="A GNU Social-compatible microblogging server"
arch=('i686' 'x86_64')
url="https://mastodon.social"
license=('AGPL-3.0')
-conflicts=("${pkgname%-git}", "${pkgname%-git}-docker", "${pkgname%-git}-docker-git")
+conflicts=("${pkgname%-git}" "${pkgname%-git}-docker" "${pkgname%-git}-docker-git")
makedepends=(
'yarn'
)