Updated

4 files changed, 12 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f76a545762e..2fdaf0a0e9fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = xpsk31
 	pkgdesc = Ham Radio PSK31 engine using X/GTK+
-	pkgver = 3.1
+	pkgver = 3.2
 	pkgrel = 1
 	url = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31.html
-	install = xpsk31.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -13,23 +12,20 @@ pkgbase = xpsk31
 	makedepends = pkg-config
 	depends = gtk2
 	depends = alsa-lib
-	depends = desktop-file-utils
-	source = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31-3.1.tar.bz2
-	source = diff.autogen.sh
+	optdepends = hamradio-menus: XDG compliant menuing
+	source = http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31-3.2.tar.bz2
 	source = diff.Makefile.am
 	source = xpsk31.desktop
 	source = xpsk31.1
 	source = xdemorse.png
 	source = xpsk31.man.1.gz
-	md5sums = 062a60a76a5b0518164dae53d8d1c77f
-	md5sums = ad6b0e6dd69c1d0efd01efef63ace093
+	md5sums = 952385221c0a577e099ee3d3897db24b
 	md5sums = ed09102ed5862054b0f8579f78ab475f
 	md5sums = c784ec5d71a3897c515add6aa370cccd
 	md5sums = 856292e1d2c0f01745218c24e1bf690a
 	md5sums = edcd3f301ec8ea95453d40534beb6ede
 	md5sums = 633652b8446b6970576444e0b8c4e3d9
-	sha256sums = 26b686ccc6f404f42fc26416d13eef1f762f0bead3e069962f168ec69fe99eea
-	sha256sums = cc38902be0fc1026cc027cd0fdab7e78bbfb336df36b90b8f25060775636924a
+	sha256sums = b0118503dc87964cfac120de540b8c3b3d2a7cb20b4344a9cb6dd9f4a5dd519d
 	sha256sums = 2377350a73d13e78a567ab4dd035dac445cc59056d123d75d370755dfddc2e7f
 	sha256sums = d1afe06070b7a6eec1967194c2d7a5a38cf29e73dca35976a72d52707dece0a5
 	sha256sums = 1286f9c1a67f7e96440d5a218bad5e7b745642f17b72750e37089779bf75eec9
diff --git a/PKGBUILD b/PKGBUILD
index 55745d6db265..53ca93804503 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,17 @@
 # Original Contributor: Bob Finch <w9ya@arrl.net>
 
 pkgname=xpsk31
-pkgver=3.1
+pkgver=3.2
 pkgrel=1
 pkgdesc="Ham Radio PSK31 engine using X/GTK+"
 arch=('i686' 'x86_64')
 url="http://www.qsl.net/5b4az/pkg/psk31/xpsk31/xpsk31.html"
 license=(GPL)
-depends=('gtk2' 'alsa-lib' 'desktop-file-utils')
-makedepends=('autoconf' 'automake' 'intltool'
-# 'imagemagick'
- 'pkg-config')
-install=$pkgname.install
+optdepends=('hamradio-menus: XDG compliant menuing')
+depends=('gtk2' 'alsa-lib')
+makedepends=('autoconf' 'automake' 'intltool' 'pkg-config')
+# 'imagemagick: used IF you want to convert icons/images')
 source=(http://www.qsl.net/5b4az/pkg/psk31/$pkgname/$pkgname-$pkgver.tar.bz2
-	diff.autogen.sh
 	diff.Makefile.am
 	$pkgname.desktop
 	$pkgname.1
@@ -26,7 +24,6 @@ source=(http://www.qsl.net/5b4az/pkg/psk31/$pkgname/$pkgname-$pkgver.tar.bz2
 prepare() {
 	cd $srcdir/$pkgname-$pkgver
 
-	patch -p0 < ../diff.autogen.sh
 	patch -p0 < ../diff.Makefile.am
 
 #	sed -i s:xpm:png: Makefile.am
@@ -66,15 +63,13 @@ package() {
 	install -Dm644 ../xdemorse.png $pkgdir/usr/share/pixmaps/$pkgname.png
 	install -Dm644 ../$pkgname.man.1.gz $pkgdir/usr/share/man/man1/$pkgname.1.gz
 }
-md5sums=('062a60a76a5b0518164dae53d8d1c77f'
-         'ad6b0e6dd69c1d0efd01efef63ace093'
+md5sums=('952385221c0a577e099ee3d3897db24b'
          'ed09102ed5862054b0f8579f78ab475f'
          'c784ec5d71a3897c515add6aa370cccd'
          '856292e1d2c0f01745218c24e1bf690a'
          'edcd3f301ec8ea95453d40534beb6ede'
          '633652b8446b6970576444e0b8c4e3d9')
-sha256sums=('26b686ccc6f404f42fc26416d13eef1f762f0bead3e069962f168ec69fe99eea'
-            'cc38902be0fc1026cc027cd0fdab7e78bbfb336df36b90b8f25060775636924a'
+sha256sums=('b0118503dc87964cfac120de540b8c3b3d2a7cb20b4344a9cb6dd9f4a5dd519d'
             '2377350a73d13e78a567ab4dd035dac445cc59056d123d75d370755dfddc2e7f'
             'd1afe06070b7a6eec1967194c2d7a5a38cf29e73dca35976a72d52707dece0a5'
             '1286f9c1a67f7e96440d5a218bad5e7b745642f17b72750e37089779bf75eec9'
diff --git a/diff.autogen.sh b/diff.autogen.sh
deleted file mode 100644
index afd272c70050..000000000000
--- a/diff.autogen.sh
+++ /dev/null
@@ -1,7 +0,0 @@
---- autogen.sh	2013-12-02 00:01:30.000000000 -0700
-+++ autogen.sh	2015-02-03 19:46:28.373924564 -0700
-@@ -10 +10 @@
--test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9
-+test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.15
-@@ -357,0 +358 @@
-+    1.15*) automake_progs="automake-1.15 " ;;
diff --git a/xpsk31.install b/xpsk31.install
deleted file mode 100644
index 2eaa60550d51..000000000000
--- a/xpsk31.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}