Switched sources to github, fixed mimetypes in .desktop files

4 files changed, 30 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90b889c39e72..14651a7b751d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Dec 20 22:00:17 UTC 2016
+# Sun Mar 19 21:25:01 UTC 2017
 pkgbase = xastir
 	pkgdesc = Full featured APRS Tracking/Information Reporting System
 	pkgver = 2.0.8
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.xastir.org/
 	arch = i686
 	arch = x86_64
@@ -22,22 +22,22 @@ pkgbase = xastir
 	depends = gdal
 	depends = graphicsmagick
 	conflicts = xastir-cvs
-	source = http://downloads.sourceforge.net/xastir/xastir-2.0.8.tar.gz
-	source = http://downloads.sourceforge.net/xastir/xastir-sounds.tgz
+	source = https://github.com/Xastir/xastir/archive/xastir208.tar.gz
+	source = https://github.com/Xastir/xastir-sounds/archive/v1.0.tar.gz
 	source = xastir.desktop
 	source = xastir-festival.desktop
 	source = xastir-speech
 	source = xastir.png
-	md5sums = 2a1101b6cb73e18fae98c2827a0c6217
-	md5sums = 4201e7079cb5b2bd8a7c34dccfa3f2bb
-	md5sums = ba0d1f9a706ec52295265f1c34edc265
-	md5sums = dc1cc50cdf5d288951d50b3e106776c0
+	md5sums = 0e2fa97164f430b2c37a4006750207ae
+	md5sums = c314946788a828d42d804670ad23e646
+	md5sums = 2a06e041a0dc5f20c1427a130613d793
+	md5sums = 2f8af994b7f5086d4ca2d951ced9019a
 	md5sums = e56e55a1c43038d4488fbdd429a0a755
 	md5sums = 0a7269113052d3bd2711b84ff2fda9d6
-	sha512sums = fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
-	sha512sums = ab0f6cd74cc61f07588c0dcfb34c86537b5007f215bd832165f4fb652c4fa9e7be5ef4529b8deb4af8ab483b7ff9f5c4ac634e15abb049ede18a91ea6d88b602
-	sha512sums = 1893febd88b5db3a2d6cfd0615e01091f247836a66e9a3e9a4cca5a0412daf0a5e4dfd47f1308546df54ad28b11994a07903d49c62b13c0fff8f75af24f9f550
-	sha512sums = 2f81c3840246bed044c61cc4a56228a3d34ceeadb4411402f54a9ca63f6cfcc37258f3f49b31905237a39f55c8b9cd082ea31a04fe82de9cb35a25559902ed90
+	sha512sums = bfc5248e0f04ea6be8fe54527714490700538a73722b9d545e01e33cc5f75124044f5bf76f17d054f61fee7ac624360852c087a113414f66bf02505ef40b2291
+	sha512sums = 77f55f40ba9bd818e10488feb462c5fc97cab90295774a0c6b1344c6e95ac3ef215a26ba461132c4c59f857ce3a301b17e8bc3bb6fea8451327b1e8debf12f71
+	sha512sums = f3d4b611dad7c14feb0b3bc46110a6c3e74da12e69d8acdbcb987eeaaec6f2a015b316cc58340f3c0b188e885d8716631d5943cdbb6ac4e8e6c1790013c540db
+	sha512sums = 1fa98400ab344d206b714ae45bc51b82d8a8395b3a4a39878b099176571a53cc91a4fcb0a1f011a631aea2c5c4a030e2346c537dc8d934a01382c85dd130adc5
 	sha512sums = f284ce0544dd6517fbdf1d0f54d7e67f73f6eb0928bf2bd525db2aa0b0f13f61451fe7e669542730a9b77bbc6b2bf679b076fd632584684d433939f21d824ed3
 	sha512sums = bc4f634825b577baf763f84441f27502480bec7020f84c98c9da1d961014d41d554d1d38d1ac29543ecb71f2f1a88f34f75d895e609bad1ec77a3670f3639874
 
diff --git a/PKGBUILD b/PKGBUILD
index cfb459181901..063621ac0cfe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,26 +3,27 @@
 # Contributor: Gordon JC Pearce <gordon at gjcp dot net>
 pkgname=xastir
 pkgver=2.0.8
-pkgrel=1
+gitver=208
+pkgrel=2
 pkgdesc="Full featured APRS Tracking/Information Reporting System"
 url="http://www.xastir.org/"
 license=('GPL' 'LGPL')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-        http://downloads.sourceforge.net/$pkgname/$pkgname-sounds.tgz
+source=(https://github.com/Xastir/$pkgname/archive/$pkgname$gitver.tar.gz
+        https://github.com/Xastir/$pkgname-sounds/archive/v1.0.tar.gz
         $pkgname.desktop
         $pkgname-festival.desktop
         $pkgname-speech
         $pkgname.png)
-md5sums=('2a1101b6cb73e18fae98c2827a0c6217'
-         '4201e7079cb5b2bd8a7c34dccfa3f2bb'
-         'ba0d1f9a706ec52295265f1c34edc265'
-         'dc1cc50cdf5d288951d50b3e106776c0'
+md5sums=('0e2fa97164f430b2c37a4006750207ae'
+         'c314946788a828d42d804670ad23e646'
+         '2a06e041a0dc5f20c1427a130613d793'
+         '2f8af994b7f5086d4ca2d951ced9019a'
          'e56e55a1c43038d4488fbdd429a0a755'
          '0a7269113052d3bd2711b84ff2fda9d6')
-sha512sums=('fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f'
-            'ab0f6cd74cc61f07588c0dcfb34c86537b5007f215bd832165f4fb652c4fa9e7be5ef4529b8deb4af8ab483b7ff9f5c4ac634e15abb049ede18a91ea6d88b602'
-            '1893febd88b5db3a2d6cfd0615e01091f247836a66e9a3e9a4cca5a0412daf0a5e4dfd47f1308546df54ad28b11994a07903d49c62b13c0fff8f75af24f9f550'
-            '2f81c3840246bed044c61cc4a56228a3d34ceeadb4411402f54a9ca63f6cfcc37258f3f49b31905237a39f55c8b9cd082ea31a04fe82de9cb35a25559902ed90'
+sha512sums=('bfc5248e0f04ea6be8fe54527714490700538a73722b9d545e01e33cc5f75124044f5bf76f17d054f61fee7ac624360852c087a113414f66bf02505ef40b2291'
+            '77f55f40ba9bd818e10488feb462c5fc97cab90295774a0c6b1344c6e95ac3ef215a26ba461132c4c59f857ce3a301b17e8bc3bb6fea8451327b1e8debf12f71'
+            'f3d4b611dad7c14feb0b3bc46110a6c3e74da12e69d8acdbcb987eeaaec6f2a015b316cc58340f3c0b188e885d8716631d5943cdbb6ac4e8e6c1790013c540db'
+            '1fa98400ab344d206b714ae45bc51b82d8a8395b3a4a39878b099176571a53cc91a4fcb0a1f011a631aea2c5c4a030e2346c537dc8d934a01382c85dd130adc5'
             'f284ce0544dd6517fbdf1d0f54d7e67f73f6eb0928bf2bd525db2aa0b0f13f61451fe7e669542730a9b77bbc6b2bf679b076fd632584684d433939f21d824ed3'
             'bc4f634825b577baf763f84441f27502480bec7020f84c98c9da1d961014d41d554d1d38d1ac29543ecb71f2f1a88f34f75d895e609bad1ec77a3670f3639874')
 arch=('i686' 'x86_64')
@@ -32,7 +33,8 @@ makedepends=('autoconf' 'automake')
 conflicts=('xastir-cvs')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/Xastir-$pkgname$gitver
+  ./bootstrap.sh
   ./configure --prefix=/usr
   
   sed -i -e s:doc/xastir:xastir/doc: Makefile
@@ -41,7 +43,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/Xastir-$pkgname$gitver
   make DESTDIR=$pkgdir install
 
   mkdir -p $pkgdir/usr/share/applications
@@ -51,7 +53,7 @@ package() {
   install -m644 *.png $pkgdir/usr/share/pixmaps/
   install -m755 $pkgname-speech $pkgdir/usr/bin/
   rm $pkgdir/usr/share/$pkgname/sounds/*
-  install -m644 sounds/* $pkgdir/usr/share/$pkgname/sounds/
+  install -m644 $srcdir/$pkgname-sounds-1.0/sounds/* $pkgdir/usr/share/$pkgname/sounds/
   
   chmod 4755 $pkgdir/usr/bin/$pkgname
 }
diff --git a/xastir-festival.desktop b/xastir-festival.desktop
index 6dbca28f33af..9bf8c4510350 100644
--- a/xastir-festival.desktop
+++ b/xastir-festival.desktop
@@ -6,7 +6,7 @@ Comment[en_US]=Full featured APRS client
 Encoding=UTF-8
 Exec=xastir-speech
 Icon=xastir.png
-MimeType=text
+MimeType=text/plain
 StartupNotify=true
 Terminal=
 TerminalOptions=
diff --git a/xastir.desktop b/xastir.desktop
index 6e3bf98efe01..a05fc7dcf6ea 100644
--- a/xastir.desktop
+++ b/xastir.desktop
@@ -6,7 +6,7 @@ Comment[en_US]=Full featured APRS client
 Encoding=UTF-8
 Exec=xastir
 Icon=xastir.png
-MimeType=text
+MimeType=text/plain
 StartupNotify=true
 Terminal=
 TerminalOptions=