Updated

4 files changed, 29 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5c7ecbf7dac..eebbd950cbcd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = qle
 	pkgdesc = QSO logger and log editor
-	pkgver = 0.0.39
-	pkgrel = 2
+	pkgver = 0.0.40
+	pkgrel = 1
 	url = http://home.kpn.nl/w.knol18/qle/qle.html
-	install = qle.install
 	arch = any
 	license = GPL
 	depends = perl>=5.10.0
@@ -15,27 +14,27 @@ pkgbase = qle
 	depends = perl-dbi
 	depends = perl-config-general
 	depends = perl-term-twiddle-qle
-	depends = desktop-file-utils
 	depends = perl-tk-splash>=0.16
+	depends = hamradio-menus
 	optdepends = hamlib: rig interfacing
 	optdepends = cwdaemon: transmitting cw
-	optdepends = winkeydeamon: usb cw xmit
+	optdepends = winkeydaemon: usb cw xmit
 	optdepends = perl-tk-fontdialog: font choosing
 	optdepends = masterscp: supercheckpartial files
 	optdepends = cty: country files
 	optdepends = bigcty: contest version country files
-	source = http://home.kpn.nl/w.knol18/qle/qle-0.0.39.tar.gz
+	source = http://home.kpn.nl/w.knol18/qle/qle-0.0.40.tar.gz
 	source = qle.desktop
 	source = qle.png
 	source = qle.1
-	md5sums = 603d1d135e319052a0aa49c0481d8a5b
+	md5sums = a9af22383c5c93183a7d9cb539b08264
 	md5sums = b857e609ba681a0b165cd4fe6892844f
 	md5sums = 5b60b0fe52cb3ca0fab0cfe87a5f0c8a
-	md5sums = 5336ffafaf571479902a7fedad2eb1e5
-	sha256sums = 9f69df697823ff0ef1aa96106f3dce9cc20d893870651fbbd777875182fc8e5e
+	md5sums = 6d96b9ef2d85019c2630819db6e2e369
+	sha256sums = 37583ab5a7fd39ba9e5c87c42fe7b9112ab5cf4605b217c13dac193379409e81
 	sha256sums = 382596bf1c17c2325cf5fb9bd80c3e9d9384d24a2bf137c1dbfa135f51dbfdb4
 	sha256sums = a01093436465b946dc39d49a69ddf55ab9ec7ae56d4408167d03bbf698c5c570
-	sha256sums = cfa9eea5728466b61b1852ea85fdfe6085b63b2fd73fe11168799e7015f351aa
+	sha256sums = 75f688dddbddada3c9ade3a6a74809853ad3f15f94ed4d85f410ad7cdcc5a20c
 
 pkgname = qle
 
diff --git a/PKGBUILD b/PKGBUILD
index 1d3303030e42..8ba6cde35d8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,38 @@
 # Contributor: WB2FKO <mph at sportscliche dot com>
 
 pkgname=qle
-pkgver=0.0.39
-pkgrel=2
+pkgver=0.0.40
+pkgrel=1
 pkgdesc="QSO logger and log editor"
 arch=('any')
 url="http://home.kpn.nl/w.knol18/qle/qle.html"
 license=('GPL')
 depends=('perl>=5.10.0' 'perl-tk' 'sqlite3' 'sqlite3-doc' 'perl-pdf-labels' 'perl-dbd-sqlite' 
-	 'perl-dbi' 'perl-config-general' 'perl-term-twiddle-qle' 'desktop-file-utils'
-	 'perl-tk-splash>=0.16')
+	 'perl-dbi' 'perl-config-general' 'perl-term-twiddle-qle' 'perl-tk-splash>=0.16'
+	 'hamradio-menus')
 optdepends=('hamlib: rig interfacing'
 	    'cwdaemon: transmitting cw'
-	    'winkeydeamon: usb cw xmit'
+	    'winkeydaemon: usb cw xmit'
 	    'perl-tk-fontdialog: font choosing'
 	    'masterscp: supercheckpartial files'
 	    'cty: country files'
 	    'bigcty: contest version country files')
-install=$pkgname.install
 source=(http://home.kpn.nl/w.knol18/qle/$pkgname-$pkgver.tar.gz
         $pkgname.desktop
         $pkgname.png
 	$pkgname.1)
 
 prepare() {
-	cd "$srcdir/$pkgname-$pkgver/"
+	cd $srcdir/$pkgname-$pkgver/
 	sed -i s:'=$HOME\S*':'=$HOME/qle': qle.sh
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver/"
+	cd $srcdir/$pkgname-$pkgver/
+
 	install -d $pkgdir/usr/share/$pkgname
 	cp -a $srcdir/$pkgname-$pkgver/* $pkgdir/usr/share/$pkgname
+	rm $pkgdir/usr/share/$pkgname/COPYING
 
 	mkdir -p $pkgdir/usr/bin
 	install -D -m 755 ../$pkgname.1 $pkgdir/usr/bin/$pkgname
@@ -41,11 +42,11 @@ package() {
 	install -D -m 644 ../$pkgname.png $pkgdir/usr/share/pixmaps
 	install -D -m 644 ../$pkgname.desktop $pkgdir/usr/share/applications
 }
-md5sums=('603d1d135e319052a0aa49c0481d8a5b'
+md5sums=('a9af22383c5c93183a7d9cb539b08264'
          'b857e609ba681a0b165cd4fe6892844f'
          '5b60b0fe52cb3ca0fab0cfe87a5f0c8a'
-         '5336ffafaf571479902a7fedad2eb1e5')
-sha256sums=('9f69df697823ff0ef1aa96106f3dce9cc20d893870651fbbd777875182fc8e5e'
+         '6d96b9ef2d85019c2630819db6e2e369')
+sha256sums=('37583ab5a7fd39ba9e5c87c42fe7b9112ab5cf4605b217c13dac193379409e81'
             '382596bf1c17c2325cf5fb9bd80c3e9d9384d24a2bf137c1dbfa135f51dbfdb4'
             'a01093436465b946dc39d49a69ddf55ab9ec7ae56d4408167d03bbf698c5c570'
-            'cfa9eea5728466b61b1852ea85fdfe6085b63b2fd73fe11168799e7015f351aa')
+            '75f688dddbddada3c9ade3a6a74809853ad3f15f94ed4d85f410ad7cdcc5a20c')
diff --git a/qle.1 b/qle.1
index 21b185542a6e..67d98b75c725 100644
--- a/qle.1
+++ b/qle.1
@@ -1,11 +1,15 @@
 #!/bin/sh
-mkdir -p $HOME/qle
+mkdir -p $HOME/qle/backup
 cd $HOME/qle
+cp -a *.db backup/.
+cp -a config/ backup/
 cp -ua /usr/share/qle/* .
+rm -f COPYING INSTALL BUGS NEWS
+cp -a backup/* .
 if [ -f /usr/share/cty/cty.dat ]; then
-    cp -ua /usr/share/cty/cty.dat .
+ln -sf /usr/share/cty/cty.dat cty.dat
 fi
 if [ -f /usr/share/masterscp/MASTER.SCP ]; then
-    cp -ua /usr/share/masterscp/MASTER.SCP master.scp
+ln -sf /usr/share/masterscp/MASTER.SCP master.scp
 fi
 ./qle.sh
diff --git a/qle.install b/qle.install
deleted file mode 100644
index 2eaa60550d51..000000000000
--- a/qle.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}