summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d2945e3f5dd..b28f1624ca6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sat Apr 15 23:05:42 UTC 2017
+# Sat Apr 15 23:07:33 UTC 2017
pkgbase = nylas-mail-git
pkgdesc = Nylas Mail: A new mail client for Linux, Mac and Windows, built on the modern web and designed to be extended. (formerly N1, git version)
pkgver = 1.0.26.49.g52452d6d
@@ -23,6 +23,7 @@ pkgbase = nylas-mail-git
depends = nss
depends = alsa-lib
depends = libxss
+ conflicts = nylas-mail
conflicts = nylas-mail-bin
source = git://github.com/nylas/nylas-mail.git
source = nylas-mail.desktop
diff --git a/PKGBUILD b/PKGBUILD
index b9ddd996d33..2f31cc88410 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ url="https://nylas.com"
license=('MIT')
makedepends=('nvm' 'grunt-cli')
depends=('gtk2' 'libgnome-keyring' 'gnome-keyring' 'desktop-file-utils' 'python2' 'gconf' 'nodejs' 'libnotify' 'libxtst' 'nss' 'alsa-lib' 'libxss')
-conflicts=('nylas-mail-bin')
+conflicts=('nylas-mail' 'nylas-mail-bin')
source=('git://github.com/nylas/nylas-mail.git'
${_pkgname}.desktop
${_pkgname}.png)