Bump to binary v1.2.0

4 files changed, 13 insertions, 118 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb34b9ff2276..2ca6ca7cb61b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,13 @@
 pkgbase = artisan-roaster-scope
 	pkgdesc = Artisan is a software that helps coffee roasters record, analyze, and control roast profiles.
-	pkgver = 1.1.0
+	pkgver = 1.2.0
 	pkgrel = 1
 	url = https://github.com/artisan-roaster-scope/artisan
-	install = artisan-roaster-scope.install
-	arch = any
+	arch = x86_64
 	license = GPL3
-	makedepends = git
-	depends = python2
-	depends = python2-sip
-	depends = python2-scipy
-	depends = python2-numpy
-	depends = python2-pyserial
-	depends = python2-requests
-	depends = python2-pyqt5
-	depends = python2-matplotlib
-	depends = python2-qrcode
-	depends = python2-bottle
-	depends = python2-gevent
-	depends = python2-gevent-websocket
-	depends = python2-phidgets
-	depends = python2-pymodbus
-	depends = python2-yoctopuce
-	depends = python2-unidecode
-	source = https://github.com/artisan-roaster-scope/artisan/archive/v1.1.0.tar.gz
-	source = artisan-v1.1.0-bugs.patch
-	md5sums = 87d84a79537c3c66fafa367d779eeb17
-	md5sums = 72da7888224102ee896a1d1ebebaa1b5
+	depends = python
+	source = https://github.com/artisan-roaster-scope/artisan/releases/download/v1.2.0/artisan-linux-1.2.0_amd64.deb
+	sha256sums = 292734bd254e49a93eb173869cb49c87c2ddca077eacbcde080c48fa8eeb5d6f
 
 pkgname = artisan-roaster-scope
 
diff --git a/PKGBUILD b/PKGBUILD
index 52d9b0420570..c47791d64c74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,90 +1,23 @@
 # Maintainer: Christian Schwarz <me@cschwarz.com>
 pkgname=artisan-roaster-scope
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Artisan is a software that helps coffee roasters record, analyze, and control roast profiles."
-arch=("any")
+arch=("x86_64")
 url="https://github.com/artisan-roaster-scope/artisan"
 license=('GPL3')
-depends=( "python2"
-          "python2-sip"
-          "python2-scipy"
-          "python2-numpy"
-          "python2-pyserial"
-          "python2-requests"
-          "python2-pyqt5"
-          "python2-matplotlib"
-          "python2-qrcode"
-          "python2-bottle"
-          "python2-gevent"
-          "python2-gevent-websocket"
-          "python2-phidgets"
-          "python2-pymodbus"
-          "python2-yoctopuce"
-          "python2-unidecode"
-)
-makedepends=('git')
+depends=( "python" )
 source=(
-"https://github.com/artisan-roaster-scope/artisan/archive/v${pkgver}.tar.gz"
-"artisan-v1.1.0-bugs.patch"
+"https://github.com/artisan-roaster-scope/artisan/releases/download/v${pkgver}/artisan-linux-${pkgver}_amd64.deb"
 )
-md5sums=(
-'87d84a79537c3c66fafa367d779eeb17'
-'72da7888224102ee896a1d1ebebaa1b5'
+sha256sums=(
+'292734bd254e49a93eb173869cb49c87c2ddca077eacbcde080c48fa8eeb5d6f'
 )
-#generate with 'makepkg -g'
-
-install="$pkgname.install"
 
 prepare() {
-  
-  cd "$srcdir/artisan-${pkgver}"
-
-  # Package thinks /usr/bin/env python returns python2 
-  find .  -name "*.py" -exec sed -i \
-            "s/#\!\/usr\/bin\/env python[\s\n]*/#\!\/usr\/bin\/env python2/" {} +
-  find .  -name "*.py" -exec sed -i \
-            "s/#\!\/usr\/bin\/python/#\!\/usr\/bin\/python2/" {} +
-
+	tar -xf data.tar.gz
 }
 
 package() {
-  
-  cd "$srcdir/artisan-${pkgver}/src"
-  patch artisanlib/main.py "$srcdir/artisan-v1.1.0-bugs.patch"
-
-
-  # Copy the relevant project files to usr/share/artisan  
-  cp -r debian/usr "$pkgdir/"
-  
-  usrshr="$pkgdir/usr/share/artisan"
-
-  install -m755 -d "$usrshr"
-
-  cp -r artisanlib "$usrshr"
-  cp artisan*.{icns,ico,png,pro,py} "$usrshr"
-  cp Comm*.py "$usrshr"
-  cp -r const "$usrshr"
-  cp -r icons "$usrshr"
-  cp -r includes "$usrshr"
-  cp KERNpython3.py "$usrshr"
-  cp LICENSE.txt "$usrshr"
-  cp qt.conf "$usrshr"
-  cp -r translations "$usrshr"
-  cp -r Wheels "$usrshr"
-
-  # xdg-mime filetype descriptions
-  install -m755 -d "$pkgdir/usr/share/appdata"
-  cp *.xml "$pkgdir/usr/share/appdata"
-
-  # Make main script executable
-  chmod +x "$usrshr/artisan.py"
-
-  # Create a symlink to the main python script in usr/bin
-  install -m755 -d "$pkgdir/usr/bin"
-  cd "$pkgdir/usr/bin"
-  ln -sf "../share/artisan/artisan.py" artisan
-
+	cp -r ${srcdir}/usr ${pkgdir}/
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/artisan-roaster-scope.install b/artisan-roaster-scope.install
deleted file mode 100644
index f98ba7338938..000000000000
--- a/artisan-roaster-scope.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/artisan-v1.1.0-bugs.patch b/artisan-v1.1.0-bugs.patch
deleted file mode 100644
index 252c5cf4bfff..000000000000
--- a/artisan-v1.1.0-bugs.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-8944c8944
-<                     if self.temp_decay_weights == None or len(self.temp_decay_weights) != cf: # recompute only on changes
----
->                     if self.temp_decay_weights is None or len(self.temp_decay_weights) != cf: # recompute only on changes
-8986c8986
-<                                 if self.decay_weights == None or len(self.decay_weights) != user_filter: # recompute only on changes
----
->                                 if self.decay_weights is None or len(self.decay_weights) != user_filter: # recompute only on changes