Remove conflicts with git-delta + add docs.

2 files changed, 4 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22ccb42aefa7..b08792318a92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deltachat-cursed
 	pkgdesc = Delta Chat client for the command line
 	pkgver = 0.7.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/adbenitez/deltachat-cursed
 	arch = any
 	license = GPL
@@ -10,12 +10,7 @@ pkgbase = deltachat-cursed
 	depends = python-urwid_readline
 	depends = python-deltachat
 	depends = python-emoji
-	conflicts = git-delta
 	source = https://files.pythonhosted.org/packages/f1/46/5e1e4613b0fa6ccbca065825eb450a664a0c9e9409578bf08f1ae58db633/deltachat_cursed-0.7.2.tar.gz
 	sha256sums = 661cb8097314b86c74aafc7ae4e7e9bcdbb0b1ad3d757fc2bb27aad4c877cf1f
 
 pkgname = deltachat-cursed
-	depends = python-notify-py
-	depends = python-urwid_readline
-	depends = python-deltachat
-	depends = python-emoji
diff --git a/PKGBUILD b/PKGBUILD
index 7f95d600420c..42f6697ccb00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,11 @@
 pkgname=deltachat-cursed
 _module=deltachat_cursed
 pkgver=0.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Delta Chat client for the command line"
 url="https://github.com/adbenitez/deltachat-cursed"
 depends=(python-notify-py python-urwid_readline python-deltachat python-emoji)
 makedepends=(python-setuptools)
-conflicts=(git-delta)
 license=('GPL')
 arch=('any')
 source=("https://files.pythonhosted.org/packages/f1/46/5e1e4613b0fa6ccbca065825eb450a664a0c9e9409578bf08f1ae58db633/deltachat_cursed-${pkgver}.tar.gz")
@@ -20,7 +19,8 @@ build() {
 }
 
 package() {
-    depends+=()
     cd "${srcdir}/${_module}-${pkgver}"
     python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    rm "${pkgdir}/usr/bin/delta"
+    install -Dm644 docs/user-guide.md "${pkgdir}/usr/share/doc/deltachat-cursed/user_guide.md"
 }