summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a374d72b61dd..44d4987667c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = synct-git
pkgdesc = A POSIX shell client for the Syncthing REST API with personal idiosyncracies
- pkgver = r14.2269103
+ pkgver = r25.3ee9c8e
pkgrel = 1
url = https://github.com/xeruf/synct
arch = any
@@ -9,8 +9,9 @@ pkgbase = synct-git
depends = grep
depends = curl
depends = bat
- optdepends = git: merging with synct-diff
+ optdepends = git: merging in synct-diff
optdepends = jrnl: auto-merging journal conflicts
+ optdepends = emacs: merging with ediff in synct-diff
provides = synct
conflicts = synct
source = git+https://github.com/xeruf/synct
diff --git a/PKGBUILD b/PKGBUILD
index b66e31113a6f..c413c1c2c0c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname='synct'
pkgname="${_pkgname}-git"
-pkgver=r14.2269103
+pkgver=r25.3ee9c8e
pkgrel=1
pkgdesc='A POSIX shell client for the Syncthing REST API with personal idiosyncracies'
arch=('any')
@@ -11,7 +11,9 @@ license=('Unlicense')
depends=(coreutils grep curl bat)
provides=("${_pkgname}")
conflicts=("${_pkgname}")
-optdepends=('git: merging with synct-diff' 'jrnl: auto-merging journal conflicts')
+optdepends=('git: merging in synct-diff'
+ 'jrnl: auto-merging journal conflicts'
+ 'emacs: merging with ediff in synct-diff')
source=("git+${url}")
sha512sums=('SKIP')