Multiple changes

* fix typo ("onflicts")
* add shell wrapper
* add desktop file
* rename dtc to kdtc to avoid conflict with dtc package
* jar file moved to /usr/share/java as per package guidelines
* add jose1711 as a co-maintainer

4 files changed, 34 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f4401a3946fe..218ebb177e7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,25 @@
 pkgbase = kryoflux
 	pkgdesc = USB Floppy Controller for Software Preservation
 	pkgver = 2.6
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.kryoflux.com
 	arch = i686
 	arch = x86_64
 	license = custom
+	makedepends = gendesk
 	depends = libusb
 	optdepends = jre7-openjdk: for the Kryoflux GUI
 	provides = capsimage
+	conflicts = capsimage
 	source = http://www.kryoflux.com/download/kryoflux_2.6_linux.tar.bz2
 	source = 80-kryoflux.rules
 	source = kryoflux.conf
+	source = kryoflux.sh
+	source = kryoflux.png
 	md5sums = 12d57dcc9657a90c583dded553b8a2e1
 	md5sums = 43ec7eb49fbdab703cafe146145fe0de
 	md5sums = ede10c48b2b1edc5c346e8814f07bcdb
+	md5sums = 0c9d40001d3ebed40dd3032cbdc7ba54
+	md5sums = 510bdad5af6d032a9543a80ae680295e
 
 pkgname = kryoflux
-
diff --git a/PKGBUILD b/PKGBUILD
index a8a15a3abea0..cbc6c130504c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,33 @@
+# Co-Maintainer: Jose Riha <jose1711 gmail com>
 # Maintainer: John Lane <archlinux at jelmail dot com>
 
 pkgname=kryoflux
 pkgdesc="USB Floppy Controller for Software Preservation"
 pkgver=2.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.kryoflux.com"
 license=('custom')
 provides=('capsimage')
-onflicts=('capsimage')
+conflicts=('capsimage')
 depends=('libusb')
+makedepends=('gendesk')
 optdepends=('jre7-openjdk: for the Kryoflux GUI')
 source=("http://www.kryoflux.com/download/kryoflux_${pkgver}_linux.tar.bz2"
         '80-kryoflux.rules'
-        'kryoflux.conf')
+        'kryoflux.conf'
+        'kryoflux.sh'
+        'kryoflux.png')
 md5sums=('12d57dcc9657a90c583dded553b8a2e1'
          '43ec7eb49fbdab703cafe146145fe0de'
-         'ede10c48b2b1edc5c346e8814f07bcdb')
+         'ede10c48b2b1edc5c346e8814f07bcdb'
+         '0c9d40001d3ebed40dd3032cbdc7ba54'
+         '510bdad5af6d032a9543a80ae680295e')
+
+prepare() {
+  cd "${srcdir}"
+  gendesk -f -n --pkgname "${pkgname}" --pkgdesc "Control program for KryoFlux" --exec "kryoflux" --categories "Utility;Archiving"
+}
 
 package() {
 
@@ -29,8 +40,9 @@ package() {
 
   cd "$srcdir/kryoflux_${pkgver}_linux"
   install -d ${pkgroot}/{bin,lib}
-
-  install dtc/${CARCH}/static/dtc dtc/kryoflux-ui.jar ${pkgroot}/bin
+  # rename dtc binary to kdtc to avoid clash with dtc package (suggested by @frankspace)
+  install dtc/${CARCH}/static/dtc ${pkgroot}/bin/kdtc
+  install -Dm644 dtc/kryoflux-ui.jar ${pkgroot}/share/java/kryoflux/kryoflux-ui.jar
   cp -P dtc/${CARCH}/lib* ${pkgroot}/lib
 
   # Firmwares: choose one or the other
@@ -43,7 +55,13 @@ package() {
   install docs/* ${pkgdir}/usr/share/doc/kryoflux
   install dtc/*README* ${pkgdir}/usr/share/doc/kryoflux
   cp -a schematics ${pkgdir}/usr/share/doc/kryoflux
-  
+
+  # Shell wrapper
+  install -Dm755 ${srcdir}/kryoflux.sh ${pkgroot}/bin/kryoflux
+
+  # Desktop file
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgroot}/share/applications/${pkgname}.desktop"
+  install -Dm644 "${srcdir}/${pkgname}.png" "${pkgroot}/share/pixmaps/${pkgname}.png"
 }
 
 # vim: ft=sh syn=sh et
diff --git a/kryoflux.png b/kryoflux.png
new file mode 100644
index 000000000000..3e0e3cec3c5b
--- /dev/null
+++ b/kryoflux.png
diff --git a/kryoflux.sh b/kryoflux.sh
new file mode 100644
index 000000000000..8bcf9c946f1f
--- /dev/null
+++ b/kryoflux.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+archlinux-java-run --max 8 -- -jar /usr/share/java/kryoflux/kryoflux-ui.jar