Fix issues with desktop file and add bash completion

3 files changed, 17 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca8e33ab89d0..da9746fdd6db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = yubikey-manager-git
 	pkgdesc = Command line and GUI tool for configuring YubiKeys, over all transports.
 	pkgver = 0.1.0.r50.19abdf1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/Yubico/yubikey-manager
 	arch = any
 	license = BSD
@@ -19,8 +19,10 @@ pkgbase = yubikey-manager-git
 	conflicts = yubikey-manager
 	source = yubikey-manager::git+https://github.com/Yubico/yubikey-manager.git
 	source = git+https://github.com/Yubico/python-yubicommon.git
+	source = ykman-gui.desktop
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = 57e9637916c0f32f06294ddeae09310a881db0c3443ac14bdef18cc9141d34be
 
 pkgname = yubikey-manager-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5c3535deaf6d..da99b468708c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=('yubikey-manager-git')
 _gitname='yubikey-manager'
 pkgver=0.1.0.r50.19abdf1
-pkgrel=4
+pkgrel=5
 pkgdesc='Command line and GUI tool for configuring YubiKeys, over all transports.'
 arch=('any')
 url='https://github.com/Yubico/yubikey-manager'
@@ -13,9 +13,11 @@ makedepends=('git' 'python2-pyside-tools' 'imagemagick')
 conflicts=('yubikey-manager')
 provides=('yubikey-manager')
 source=("$_gitname::git+https://github.com/Yubico/yubikey-manager.git"
-	"git+https://github.com/Yubico/python-yubicommon.git")
+	"git+https://github.com/Yubico/python-yubicommon.git"
+	'ykman-gui.desktop')
 sha256sums=('SKIP'
-	    'SKIP')
+            'SKIP'
+            '57e9637916c0f32f06294ddeae09310a881db0c3443ac14bdef18cc9141d34be')
 
 pkgver() {
   cd "$srcdir/$_gitname"
@@ -35,15 +37,19 @@ package() {
   python setup.py qt_resources
   python setup.py install --root="$pkgdir/" --optimize=1
 
-  install -D -m0644 resources/yubikey-manager.png "$pkgdir/usr/share/icons/hicolor/128x128/yubikey-manager.png"
+  install -D -m0644 resources/yubikey-manager.png "$pkgdir/usr/share/icons/hicolor/128x128/apps/yubikey-manager.png"
   for SIZE in 16 24 32 48 64 96; do
     convert -scale $SIZE resources/yubikey-manager.png "$srcdir/yubikey-manager.png"
     install -Dm0644 "$srcdir/yubikey-manager.png" "$pkgdir/usr/share/icons/hicolor/$SIZEx$SIZE/apps/yubikey-manager.png"
   done
 
-  install -Dm0644 resources/ykman.desktop "$pkgdir/usr/share/applications/ykman.desktop"
+  install -Dm0644 "$srcdir/ykman-gui.desktop" "$pkgdir/usr/share/applications/ykman-gui.desktop"
 
   install -Dm0644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm0644 README "$pkgdir/usr/share/doc/yubikey-manager/README"
+  install -Dm0644 NEWS "$pkgdir/usr/share/doc/yubikey-manager/NEWS"
+
+  install -d "$pkgdir/usr/share/bash-completion/completions/"
+  _YKMAN_COMPLETE=source "$pkgdir/usr/bin/ykman" > "$pkgdir/usr/share/bash-completion/completions/ykman" || true
 }
 
diff --git a/ykman.desktop b/ykman-gui.desktop
index e64621d44d69..7ae76b81350f 100644
--- a/ykman.desktop
+++ b/ykman-gui.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=YubiKey Manager
 GenericName=YubiKey Manager
-Comment=Graphical application for configuring a YubiKey.
-Exec=ykman
-Icon=ykman
+Comment=Graphical application for configuring a YubiKey
+Exec=ykman-gui
+Icon=yubikey-manager
 StartupNotify=false
 Terminal=false
 Type=Application