update version with a new source

2 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 887cf25f23f..32e9847892c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = necta-wifi-mouse
 	pkgdesc = wifi mouse for android (server part)
-	pkgver = 1.0.1
+	pkgver = 1.0.2
 	pkgrel = 1
 	url = http://wifimouse.necta.us/
 	arch = x86_64
@@ -10,10 +10,10 @@ pkgbase = necta-wifi-mouse
 	makedepends = tar
 	source = icon.png
 	md5sums = 671cbe35275357e3a42aa118a7e35a8f
-	source_x86_64 = mouseserver-x86_64.zip::http://wifimouse.necta.us/MouseServerLinux64.zip
-	md5sums_x86_64 = 422f9c2e394b04cbde95e762194ed6de
-	source_i686 = mouseserver-i686.zip::http://wifimouse.necta.us/MouseServerLinux32.zip
-	md5sums_i686 = 2b0dca3ffa174ef505a706f05cd36869
+	source_x86_64 = mouseserver.deb::http://wifimouse.necta.us/apk/mouseserver-64.deb
+	md5sums_x86_64 = 2db5e825e61be4c3d8f391e978b75cd3
+	source_i686 = mouseserver.deb::http://wifimouse.necta.us/apk/mouseserver-32.deb
+	md5sums_i686 = 125a616a9af78a9a6552ec49e8f32571
 
 pkgname = necta-wifi-mouse
 
diff --git a/PKGBUILD b/PKGBUILD
index b1944ba5a02..45b572552ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,21 @@
 
 pkgname=necta-wifi-mouse
 pkgdesc="wifi mouse for android (server part)"
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 arch=("x86_64" "i686")
 url=http://wifimouse.necta.us/
 
-license=("unknown")
+license=("GPL2")
 source=("icon.png")
-source_x86_64=("mouseserver-x86_64.zip::http://wifimouse.necta.us/MouseServerLinux64.zip")
-source_i686=("mouseserver-i686.zip::http://wifimouse.necta.us/MouseServerLinux32.zip")
-md5sums=('671cbe35275357e3a42aa118a7e35a8f')
-md5sums_x86_64=('422f9c2e394b04cbde95e762194ed6de')
-md5sums_i686=('2b0dca3ffa174ef505a706f05cd36869')
+source_x86_64=("mouseserver.deb::http://wifimouse.necta.us/apk/mouseserver-64.deb")
+source_i686=("mouseserver.deb::http://wifimouse.necta.us/apk/mouseserver-32.deb")
 
 depends=() 
 makedepends=("sed" "tar")
 
 prepare() {
-	# extract deb
-	suffix=$pkgver-$CARCH
-	if [ "$CARCH" == "i686" ]; then
-		suffix=$pkgver-32bit
-	fi
-
-	bsdtar -xf "$srcdir/mouseserver-$suffix.deb"
-	# extract data portion
+	# extract data portion of deb file
 	tar -xf "$srcdir/data.tar.gz"	
 }
 
@@ -34,15 +24,22 @@ package() {
 	# create destination directories
 	mkdir -p "$pkgdir/usr/bin"
 	mkdir -p "$pkgdir/usr/share/applications"
+	mkdir -p "$pkgdir/usr/share/mouseserver/icons"
 	mkdir -p "$pkgdir/usr/share/icons/hicolor/128x128/apps/"
 	
 	# install files
 	install -m 775 "$srcdir/usr/sbin/mouseserver" "$pkgdir/usr/bin"
 	install -m 664 "$srcdir/usr/share/applications/mouseserver.desktop" "$pkgdir/usr/share/applications/mouseserver.desktop"
 	install -m 664 "$srcdir/icon.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/mouseserver.png"
+	install -m 644 -D "$srcdir/usr/share/mouseserver/icons/"* "$pkgdir/usr/share/mouseserver/icons"
 
 	# modify desktop file
 	desktopfile="$pkgdir/usr/share/applications/mouseserver.desktop"
 	sed -i 's/Exec=.*$/Exec=\/usr\/bin\/mouseserver/'                                       "$desktopfile"
 	sed -i 's/Icon=.*$/Icon=\/usr\/share\/icons\/hicolor\/128x128\/apps\/mouseserver.png/' "$desktopfile"
 }
+
+
+md5sums=('671cbe35275357e3a42aa118a7e35a8f')
+md5sums_x86_64=('2db5e825e61be4c3d8f391e978b75cd3')
+md5sums_i686=('125a616a9af78a9a6552ec49e8f32571')