Now using python3, new version number schema, add imagemagick as dependency

2 files changed, 13 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1fabaad21397..b48ec3d8ee66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = noteshrink-git
 	pkgdesc = Convert scans of handwritten notes to beautiful, compact PDFs
-	pkgver = r31.3f831fd
-	pkgrel = 2
+	pkgver = 0.1.r13.gfd645e9
+	pkgrel = 1
 	url = https://mzucker.github.io/2016/09/20/noteshrink.html
 	arch = any
 	license = MIT
-	depends = python2
-	depends = python2-numpy
-	depends = python2-scipy
-	depends = python2-pillow
+	depends = python
+	depends = python-numpy
+	depends = python-scipy
+	depends = python-pillow
+	depends = imagemagick
 	conflicts = noteshrink
 	source = git+http://github.com/mzucker/noteshrink.git
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6c23d424e1e2..14fbcd18fae5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,28 @@
 
 pkgname=noteshrink-git
 _pkgname=noteshrink
-pkgver=r31.3f831fd
-pkgrel=2
+pkgver=0.1.r13.gfd645e9
+pkgrel=1
 pkgdesc="Convert scans of handwritten notes to beautiful, compact PDFs"
 url='https://mzucker.github.io/2016/09/20/noteshrink.html'
 arch=('any')
 license=('MIT')
-depends=('python2' 'python2-numpy' 'python2-scipy' 'python2-pillow')
+depends=('python' 'python-numpy' 'python-scipy' 'python-pillow' 'imagemagick')
 conflicts=('noteshrink')
 source=('git+http://github.com/mzucker/noteshrink.git')
 md5sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$_pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
     cd "$srcdir/$_pkgname"
-    sed -i '1 s/python/python2/g' noteshrink.py
-    python2 setup.py build
+    python setup.py build
 }
 
 package() {
   cd "$srcdir/$_pkgname"
-  python2 setup.py install --root="$pkgdir" --optimize=1
+  python setup.py install --root="$pkgdir" --optimize=1
 }