Switch to master

2 files changed, 15 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 448484acebe9..942188e78754 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
-pkgbase = python-telethon-aio-git
+pkgbase = python-telethon-git
 	pkgdesc = Pure Python 3 Telegram client library, asyncio version
-	pkgver = 0.18.3.r133.g98449bb
-	pkgrel = 2
+	pkgver = 0.18.3.r48.g32b7e9e
+	pkgrel = 1
 	url = https://github.com/LonamiWebs/Telethon/
 	arch = any
 	license = MIT
+	makedepends = git
 	makedepends = python-setuptools
 	depends = python>=3.5
 	depends = python-pyaes
 	depends = python-rsa
 	depends = python-async_generator
+	provides = python-telethon
 	conflicts = python-telethon
+	conflicts = python-telethon-aio-git
 	options = !emptydirs
-	source = git+https://github.com/LonamiWebs/Telethon.git#branch=asyncio
+	source = git+https://github.com/LonamiWebs/Telethon.git
 	md5sums = SKIP
 
-pkgname = python-telethon-aio-git
+pkgname = python-telethon-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 21f2ab579e6c..4497da5452ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Dan Elkouby <streetwalrus@codewalr.us>
-pkgname=python-telethon-aio-git
-pkgver=0.18.3.r133.g98449bb
-pkgrel=2
+pkgname=python-telethon-git
+pkgver=0.18.3.r48.g32b7e9e
+pkgrel=1
 pkgdesc="Pure Python 3 Telegram client library, asyncio version"
 arch=('any')
 url="https://github.com/LonamiWebs/Telethon/"
 license=('MIT')
 depends=('python>=3.5' 'python-pyaes' 'python-rsa' 'python-async_generator')
-makedepends=('python-setuptools')
-conflicts=('python-telethon')
+makedepends=('git' 'python-setuptools')
+provides=('python-telethon')
+conflicts=('python-telethon' 'python-telethon-aio-git')
 options=(!emptydirs)
-source=("git+https://github.com/LonamiWebs/Telethon.git#branch=asyncio")
+source=("git+https://github.com/LonamiWebs/Telethon.git")
 md5sums=('SKIP')
 
 pkgver() {