Updated

4 files changed, 25 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68bbdde8b06b..43f60cdb3734 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,24 @@
 pkgbase = pyqso
 	pkgdesc = Ham Radio QSO logging tool.
-	pkgver = 0.2
+	pkgver = 0.3
 	pkgrel = 1
 	url = http://christianjacobs.uk/pyqso/
-	install = pyqso.install
 	arch = any
 	license = GPL3
 	depends = gtk3
-	depends = sqlite3
-	depends = python2-gobject
-	depends = desktop-file-utils
-	optdepends = hamlibs: rig control
+	depends = gobject-introspection
+	depends = python-basemap
+	depends = python-cairocffi
+	optdepends = hamlib: rig control
 	optdepends = hamradio-menus: XDG compliant menuing
-	optdepends = python2-numpy: Greyline Toolkit
-	optdepends = python2-mpltools-git: Greyline Tools
-	source = https://github.com/ctjacobs/pyqso/archive/v0.2.tar.gz
+	source = https://github.com/ctjacobs/pyqso/archive/v0.3.tar.gz
 	source = diff.setup.py
 	source = pyqso.desktop
-	md5sums = a46cddc39517123a62d2d6224869f42c
-	md5sums = 30e60f23bc1b853c3936febd1a77668e
+	md5sums = da6a627a8107ce5e84ec443467cda683
+	md5sums = 876b5de8701d6239d0f87b6cec1d8820
 	md5sums = db5223623f0a745b15798e18c1f5fc0d
-	sha256sums = 94c08ada94ab69a882c2af7725d7a67f4c02f9de8f7dc54fc473f11699e91d89
-	sha256sums = f8dd5bd66a23b106ce04091a721c3eb8c81a2c8efc9873dbdfa856d69a54145f
+	sha256sums = 5550d1fedde75f1b801b9f2ef1fde33428ade337d3161b3ac56773028d655aa8
+	sha256sums = f08c1511c480faba9725b9bfc4f2f78aab700c9c3fe770ba2e5dccfe7823d17e
 	sha256sums = b724c3782338cd546f78719137802384364522e398fb6c5a633442d25a2afb17
 
 pkgname = pyqso
diff --git a/PKGBUILD b/PKGBUILD
index 35432d60e514..d91bc4b7fe09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,49 +2,38 @@
 
 pkgname=pyqso
 _authorname=ctjacobs
-pkgver=0.2
+pkgver=0.3
 pkgrel=1
 pkgdesc="Ham Radio QSO logging tool."
 arch=('any')
 url="http://christianjacobs.uk/pyqso/"
 license=('GPL3')
-depends=('gtk3' 'sqlite3' 'python2-gobject' 'desktop-file-utils')
-makedepends=(
-#'python-sphinx'	# for building docs
-)
-optdepends=('hamlibs: rig control'
-	    'hamradio-menus: XDG compliant menuing'
-	    'python2-numpy: Greyline Toolkit'
-	    'python2-mpltools-git: Greyline Tools')
-install=$pkgname.install
+depends=('gtk3' 'gobject-introspection' 'python-basemap' 'python-cairocffi')
+#makedepends=('python-sphinx'	# for building docs)
+optdepends=('hamlib: rig control'
+	    'hamradio-menus: XDG compliant menuing')
 source=(https://github.com/${_authorname}/$pkgname/archive/v${pkgver}.tar.gz
 	diff.setup.py
 	$pkgname.desktop
 )
 
 prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd $srcdir/$pkgname-$pkgver
 
 	patch -p0 < ../diff.setup.py
 	sed -i 's:icons:share\/pyqso\/icons:g' bin/pyqso
-
-	# python2 fix
-	for file in $(find . -name '*.py' -print); do
-		sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
-		-e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file}
-	done
 }
 
 build () {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd $srcdir/$pkgname-$pkgver
 
 #	make docs
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd $srcdir/$pkgname-$pkgver
 
-	python2 setup.py install --root="$pkgdir/" --optimize=1
+	python3 setup.py install --root="$pkgdir/" --optimize=1
 
 	install -Dm644 icons/log_14x14.png $pkgdir/usr/share/pixmaps/$pkgname.png
 	install -Dm644 ../$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
@@ -52,9 +41,9 @@ package() {
 #	mkdir -p $pkgdir/usr/share/$pkgname/docs/html/{_images,_modules/pyqso,_sources,_static}
 #	cp -a docs/build/html/* $pkgdir/usr/share/$pkgname/docs/html/.
 }
-md5sums=('a46cddc39517123a62d2d6224869f42c'
-         '30e60f23bc1b853c3936febd1a77668e'
+md5sums=('da6a627a8107ce5e84ec443467cda683'
+         '876b5de8701d6239d0f87b6cec1d8820'
          'db5223623f0a745b15798e18c1f5fc0d')
-sha256sums=('94c08ada94ab69a882c2af7725d7a67f4c02f9de8f7dc54fc473f11699e91d89'
-            'f8dd5bd66a23b106ce04091a721c3eb8c81a2c8efc9873dbdfa856d69a54145f'
+sha256sums=('5550d1fedde75f1b801b9f2ef1fde33428ade337d3161b3ac56773028d655aa8'
+            'f08c1511c480faba9725b9bfc4f2f78aab700c9c3fe770ba2e5dccfe7823d17e'
             'b724c3782338cd546f78719137802384364522e398fb6c5a633442d25a2afb17')
diff --git a/diff.setup.py b/diff.setup.py
index 02de8c0b7a31..33ea0a6eb52d 100644
--- a/diff.setup.py
+++ b/diff.setup.py
@@ -1,5 +1,5 @@
 --- setup.py	2015-03-18 00:30:04.461303083 -0600
 +++ setup.py	2015-03-18 00:31:28.624388183 -0600
 @@ -31 +31 @@
--      data_files=[("icons", ["icons/log_64x64.png"])]
-+      data_files=[("share/pyqso/icons", ["icons/log_64x64.png"])]
+-      data_files=[("icons", ["icons/log_64x64.png"])],
++      data_files=[("share/pyqso/icons", ["icons/log_64x64.png"])],
diff --git a/pyqso.install b/pyqso.install
deleted file mode 100644
index 2eaa60550d51..000000000000
--- a/pyqso.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}