merged upstream

2 files changed, 4 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca294dd249fd..73b04f5c3647 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gfxtablet-git
 	pkgdesc = Android app to control a virtual Network Tablet on Linux
-	pkgver = 48.f0f20fa
-	pkgrel = 2
+	pkgver = 50.128060d
+	pkgrel = 1
 	url = http://github.com/rfc2822/GfxTablet
 	install = gfxtablet-git.install
 	arch = i686
@@ -9,10 +9,8 @@ pkgbase = gfxtablet-git
 	license = MIT
 	makedepends = git
 	source = gfxtablet-git::git://github.com/rfc2822/GfxTablet.git
-	source = tonyg::git+https://github.com/tonyg/GfxTablet.git
 	source = 99-uinput.rules
 	md5sums = SKIP
-	md5sums = SKIP
 	md5sums = b5d5b8e5291c08302a7a6dff8aa1ebf2
 
 pkgname = gfxtablet-git
diff --git a/PKGBUILD b/PKGBUILD
index 983a5c8e8f8d..cc8082724e13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,16 @@
 # Contributor: Lucki <https://aur.archlinux.org/account/Lucki/>
 
 pkgname=gfxtablet-git
-pkgver=48.f0f20fa
-pkgrel=2
+pkgver=50.128060d
+pkgrel=1
 pkgdesc="Android app to control a virtual Network Tablet on Linux"
 arch=('i686' 'x86_64')
 url="http://github.com/rfc2822/GfxTablet"
 license=('MIT')
 makedepends=('git')
 source=("$pkgname"::'git://github.com/rfc2822/GfxTablet.git'
-        'tonyg::git+https://github.com/tonyg/GfxTablet.git'
         '99-uinput.rules')
 md5sums=('SKIP'
-         'SKIP'
          'b5d5b8e5291c08302a7a6dff8aa1ebf2')
 install="${pkgname}.install"
 
@@ -22,13 +20,6 @@ pkgver() {
 	printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-   cd "$pkgname"
-   git remote add tonyg "$srcdir/tonyg" || _r=$?
-   git fetch tonyg
-   git -c user.email="makepkg@archlinux.org" -c user.name="makepkg" merge -s recursive -Xours tonyg/master
-}
-
 build() {
 	cd "$pkgname/driver-uinput"
 	make