upgpkg: battlescribe 2.03.17-1

upstream release and switch to java fx

8 files changed, 63 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f033b1b2eae..67f2afd06749 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,26 @@
 pkgbase = battlescribe
 	pkgdesc = An army list builder for table-top games.
-	pkgver = 2.03.14
+	pkgver = 2.03.17
 	pkgrel = 1
 	url = http://battlescribe.net/?tab=downloads
 	arch = any
 	license = custom
-	depends = java-environment
-	depends = bash
-	source = http://battlescribe.net/files/BattleScribe_2.03.14_Multi.zip
+	source = http://battlescribe.net/files/BattleScribe_2.03.17_Linux.zip
 	source = battlescribe.desktop
+	source = battlescribe-data-editor.desktop
+	source = battlescribe-data-indexer.desktop
 	source = battlescribe.png
-	source = BattleScribe.sh
-	md5sums = 96eddd2b9a1e2423de0243d44a1ad679
-	md5sums = 33aafcfc46f7f1ada23015a830413763
+	source = battlescribe-roster-editor
+	source = battlescribe-data-editor
+	source = battlescribe-data-indexer
+	md5sums = 257cd61a44d81bc8a90524d8046f179f
+	md5sums = 5e1ccb89db05b234416ba112bbd02372
+	md5sums = 2b54d275f9be4e57b4e605f8871c38e6
+	md5sums = 9af5e7e2a8444882061520d09af0af84
 	md5sums = d0fef06c5b080003f84a0e148fbe9261
-	md5sums = cf0f2351b3241aa80cd80854fd73045f
+	md5sums = 4187b4dcbcffd50db65d05ba59c8b414
+	md5sums = b9821873b19ba76c1405367a8c5136e3
+	md5sums = 78c218e5c350cedc273f297ad2d712d9
 
 pkgname = battlescribe
 
diff --git a/PKGBUILD b/PKGBUILD
index dfcde807cf9d..473e5f8b1296 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bennett Piater <bennett at piater dot name>
 
 pkgname='battlescribe'
-pkgver='2.03.14'
+pkgver='2.03.17'
 pkgrel=1
 pkgdesc="An army list builder for table-top games."
 arch=(any)
@@ -9,25 +9,34 @@ url="http://battlescribe.net/?tab=downloads"
 _watch="$url"
 license=('custom')
 
-depends=('java-environment' 'bash')
-source=("http://battlescribe.net/files/BattleScribe_$pkgver""_Multi.zip"
+depends=()
+source=("http://battlescribe.net/files/BattleScribe_$pkgver""_Linux.zip"
 		"$pkgname.desktop"
+		"$pkgname-data-editor.desktop"
+		"$pkgname-data-indexer.desktop"
 		"$pkgname.png"
-		'BattleScribe.sh')
-md5sums=('96eddd2b9a1e2423de0243d44a1ad679'
-         '33aafcfc46f7f1ada23015a830413763'
+		"$pkgname-roster-editor"
+		"$pkgname-data-editor"
+		"$pkgname-data-indexer"
+		)
+md5sums=('257cd61a44d81bc8a90524d8046f179f'
+         '5e1ccb89db05b234416ba112bbd02372'
+         '2b54d275f9be4e57b4e605f8871c38e6'
+         '9af5e7e2a8444882061520d09af0af84'
          'd0fef06c5b080003f84a0e148fbe9261'
-         'cf0f2351b3241aa80cd80854fd73045f')
+         '4187b4dcbcffd50db65d05ba59c8b414'
+         'b9821873b19ba76c1405367a8c5136e3'
+         '78c218e5c350cedc273f297ad2d712d9')
 
 package() {
 	cd "$srcdir"
 
 	# Copy files to system
 	install -D -t "$pkgdir/usr/share/java/$pkgname/" *.jar
-        install -Dm755 BattleScribe.sh "$pkgdir/usr/bin/$pkgname"
-	mv lib "$pkgdir/usr/share/java/$pkgname/"
+        install -Dm755 -t "$pkgdir/usr/bin/" "$pkgname-"{roster,data}-editor "$pkgname-data-indexer"
+	mv lib jre "$pkgdir/usr/share/java/$pkgname/"
 
-	# Copy the licence
+	# Copy the license
 	install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" license.txt
 
 	# Copy the desktop file and image
diff --git a/BattleScribe.sh b/battlescribe-data-editor
index 8ffaa8006e78..b6369deba3e0 100644
--- a/BattleScribe.sh
+++ b/battlescribe-data-editor
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd /usr/share/java/battlescribe
-java -jar RosterEditor.jar
+jre/bin/java -jar DataEditor.jar
diff --git a/battlescribe-data-editor.desktop b/battlescribe-data-editor.desktop
new file mode 100644
index 000000000000..3254e708041d
--- /dev/null
+++ b/battlescribe-data-editor.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=BattleScribe Data Editor
+Comment=Table-top army list builder
+Path=/usr/share/java/battlescribe
+Exec=/usr/bin/battlescribe-data-editor
+Icon=battlescribe
+Terminal=false
+Categories=Game;Java;
+X-Desktop-File-Install-Version=0.22
diff --git a/battlescribe-data-indexer b/battlescribe-data-indexer
new file mode 100644
index 000000000000..7c9dd8da16f8
--- /dev/null
+++ b/battlescribe-data-indexer
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/share/java/battlescribe
+jre/bin/java -jar DataIndexer.jar
diff --git a/battlescribe-data-indexer.desktop b/battlescribe-data-indexer.desktop
new file mode 100644
index 000000000000..0be3f081570e
--- /dev/null
+++ b/battlescribe-data-indexer.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=BattleScribe Data Indexer
+Comment=Table-top army list builder
+Path=/usr/share/java/battlescribe
+Exec=/usr/bin/battlescribe-data-indexer
+Icon=battlescribe
+Terminal=false
+Categories=Game;Java;
+X-Desktop-File-Install-Version=0.22
diff --git a/battlescribe-roster-editor b/battlescribe-roster-editor
new file mode 100644
index 000000000000..5d0e9cbadf83
--- /dev/null
+++ b/battlescribe-roster-editor
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/share/java/battlescribe
+jre/bin/java -jar RosterEditor.jar
diff --git a/battlescribe.desktop b/battlescribe.desktop
index db8cb2bcbe44..a8900ff2abf2 100644
--- a/battlescribe.desktop
+++ b/battlescribe.desktop
@@ -4,7 +4,7 @@ Version=1.0
 Name=BattleScribe Roster Editor
 Comment=Table-top army list builder
 Path=/usr/share/java/battlescribe
-Exec=/usr/bin/battlescribe
+Exec=/usr/bin/battlescribe-roster-editor
 Icon=battlescribe
 Terminal=false
 Categories=Game;Java;