aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0f47eb0b9212..ac886938c23b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,8 +21,8 @@ pkgbase = gogs
optdepends = memcached: MemCached support
optdepends = openssh: GIT over SSH support
conflicts = gogs-bin
- conflicts = gogs
conflicts = gogs-git
+ conflicts = gogs-git-dev
options = !strip
options = !emptydirs
backup = srv/gogs/conf/app.ini
diff --git a/PKGBUILD b/PKGBUILD
index d222dcbc9b08..4208d9331a73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ optdepends=('sqlite: SQLite support'
'memcached: MemCached support'
'openssh: GIT over SSH support')
makedepends=('go>=1.2' 'git>=1.7.1' 'patch')
-conflicts=('gogs-bin' 'gogs' 'gogs-git')
+conflicts=('gogs-bin' 'gogs-git' 'gogs-git-dev')
options=('!strip' '!emptydirs')
backup=('srv/gogs/conf/app.ini')