Updated

4 files changed, 31 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed5ca736ddfd..04cf239f654c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,24 @@
 pkgbase = pydxcluster
 	pkgdesc = Python2 (tk) Ham Radio DX-Cluster GUI
-	pkgver = 1.2
-	pkgrel = 2
+	pkgver = 2.21
+	pkgrel = 1
 	url = http://sourceforge.net/projects/pydxcluster/
-	install = pydxcluster.install
 	arch = any
 	license = GPL3
 	depends = python2-requests
-	depends = desktop-file-utils
-	source = http://downloads.sourceforge.net/pydxcluster/pyDxCluster_v1_2.tar.gz
+	depends = python2-pygame
+	source = https://downloads.sourceforge.net/project/pydxcluster/pyDXCluster%20v2.21/pyDXCluster_v2_21.tar.gz
 	source = pydxcluster.desktop
 	source = pydxcluster.png
 	source = pydxcluster.1
-	md5sums = 8ee5150a8f10271557b999ab0b1b07ed
+	md5sums = d49f29f55cadf08c60c65b0d92dd8e8a
 	md5sums = 047de11f8b1f7a2433008d10732341da
 	md5sums = d03076d6792be993b1d52cece985373d
-	md5sums = 26086372612eb51b3acfabefb94f24fe
-	sha256sums = c3f0dbe2c05dee1ebca9ee19f092332654eee9401492186e6a310b840b30f91c
+	md5sums = 64f0cac2f172f022edeb2e27e8c36841
+	sha256sums = f6dc61f23edda77d1346082ba7b14ab3f627a6cd746fd7db04de361975bf1e2c
 	sha256sums = b79a160b020a66a2f02d6bda7c5e1772c01c74fce4caa6a3eb5e8eeeb506a83e
 	sha256sums = 797cd5764b045edf71c95f2b874d2705e8296460730e80e2b32311b6705c33a8
-	sha256sums = ddbded75d30034bde6a206ba9e18c17d08bb1aba9edfe9f8934f10595b0d14bd
+	sha256sums = 470797e4d8a4dddce8c07cd4baf7559cd6635b28e80abd013b0acefbfda1a476
 
 pkgname = pydxcluster
 
diff --git a/PKGBUILD b/PKGBUILD
index b01c12e8e1f0..a4e6128c9dc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,50 @@
 # Maintainer: not_anonymous <nmlibertarian@gmail.com>
 
 pkgname=pydxcluster
-pkgver=1.2
-pkgrel=2
+pkgver=2.21
+pkgrel=1
 pkgdesc="Python2 (tk) Ham Radio DX-Cluster GUI"
 _dist=pyDxCluster
-_ver=v1_2
+__dist=pyDXCluster
+_ver=v2_21
 arch=('any')
 url="http://sourceforge.net/projects/pydxcluster/"
 license=('GPL3')
-depends=('python2-requests' 'desktop-file-utils')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/$pkgname/${_dist}_${_ver}.tar.gz
+depends=('python2-requests' 'python2-pygame')
+source=(https://downloads.sourceforge.net/project/$pkgname/$__dist%20v$pkgver/${__dist}_$_ver.tar.gz
         $pkgname.desktop
         $pkgname.png
 	$pkgname.1)
 
 prepare() {
-	cd "$srcdir/${_dist}_${_ver}/"
+	cd $srcdir
+
 	mv ${_dist}_${_ver}.py $pkgname.py
 	rm -f *.txt
 	sed -i 's:LICENSE:/usr/share/licenses/common/GPL3/license:' $pkgname.py
 }
 
 package() {
-	cd "$srcdir/${_dist}_${_ver}/"
-	install -d $pkgdir/usr/share/$pkgname
-	cp -a $srcdir/${_dist}_${_ver}/* $pkgdir/usr/share/$pkgname
+	cd $srcdir
+
+	mkdir -p $pkgdir/usr/share/$pkgname
+	cp *.col $pkgdir/usr/share/$pkgname
+	cp *.cfg $pkgdir/usr/share/$pkgname
+	cp *.py $pkgdir/usr/share/$pkgname
+	install -D -m 644 *.wav $pkgdir/usr/share/$pkgname
 
 	mkdir -p $pkgdir/usr/bin
-	install -D -m 755 ../$pkgname.1 $pkgdir/usr/bin/$pkgname
+	install -D -m 755 $pkgname.1 $pkgdir/usr/bin/$pkgname
 
 	mkdir -p $pkgdir/usr/share/{applications,pixmaps}
-	install -D -m 644 ../$pkgname.png $pkgdir/usr/share/pixmaps
-	install -D -m 644 ../$pkgname.desktop $pkgdir/usr/share/applications
+	install -D -m 644 $pkgname.png $pkgdir/usr/share/pixmaps
+	install -D -m 644 $pkgname.desktop $pkgdir/usr/share/applications
 }
-md5sums=('8ee5150a8f10271557b999ab0b1b07ed'
+md5sums=('d49f29f55cadf08c60c65b0d92dd8e8a'
          '047de11f8b1f7a2433008d10732341da'
          'd03076d6792be993b1d52cece985373d'
-         '26086372612eb51b3acfabefb94f24fe')
-sha256sums=('c3f0dbe2c05dee1ebca9ee19f092332654eee9401492186e6a310b840b30f91c'
+         '64f0cac2f172f022edeb2e27e8c36841')
+sha256sums=('f6dc61f23edda77d1346082ba7b14ab3f627a6cd746fd7db04de361975bf1e2c'
             'b79a160b020a66a2f02d6bda7c5e1772c01c74fce4caa6a3eb5e8eeeb506a83e'
             '797cd5764b045edf71c95f2b874d2705e8296460730e80e2b32311b6705c33a8'
-            'ddbded75d30034bde6a206ba9e18c17d08bb1aba9edfe9f8934f10595b0d14bd')
+            '470797e4d8a4dddce8c07cd4baf7559cd6635b28e80abd013b0acefbfda1a476')
diff --git a/pydxcluster.1 b/pydxcluster.1
index f3dfc024ae38..22cd4ef4d90e 100644
--- a/pydxcluster.1
+++ b/pydxcluster.1
@@ -1,5 +1,6 @@
 #!/bin/sh
 mkdir -p $HOME/pydxcluster
 cd $HOME/pydxcluster
+cp -a pydxcluster.cfg pydxcluster.cfg.backup 
 cp -ua /usr/share/pydxcluster/* .
 exec python2 pydxcluster.py
diff --git a/pydxcluster.install b/pydxcluster.install
deleted file mode 100644
index 2eaa60550d51..000000000000
--- a/pydxcluster.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}