From 7cddf290c5d9d149439a78dc55bc12aaf80d5ca2 Mon Sep 17 00:00:00 2001
From: "Frederik \"Freso\" S. Olesen" <freso.dk@gmail.com>
Date: Sun, 11 Aug 2013 20:54:27 +0200
Subject: [PATCH] mcpatcher: Moved .jar file to /usr/share/java/...

Per https://wiki.archlinux.org/index.php/Java_Package_Guidelines#Java_packaging_on_Arch_Linux
---
 .SRCINFO          | 6 +++---
 ChangeLog         | 5 +++++
 PKGBUILD          | 8 ++++----
 mcpatcher         | 2 +-
 mcpatcher.desktop | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 1a1904480537..f8f6c2bb6cba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mcpatcher
 	pkgdesc = Minecraft patcher to fix textures with higher than default resolution
 	pkgver = 4.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bitbucket.org/prupe/mcpatcher
 	changelog = ChangeLog
 	arch = any
@@ -13,8 +13,8 @@ pkgbase = mcpatcher
 	source = mcpatcher
 	source = mcpatcher.desktop
 	md5sums = 552cc0ea875032a5e15c395debdc8869
-	md5sums = 38358254be76dc84676509f43be44938
-	md5sums = 87f031f8f0fceb0feb369c6185e07fbf
+	md5sums = 9ec7aafefe59c2864b70f61d8661113d
+	md5sums = 5bcaba0e9fbc3a22159c17a64c7688fd
 
 pkgname = mcpatcher
 
diff --git a/ChangeLog b/ChangeLog
index b9c1e22d3ab6..3c04519909d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-11 Frederik "Freso" S. Olesen <archlinux@freso.dk>
+
+	* 4.2.0-2
+	Moved .jar file to /usr/share/java/mcpatcher/
+
 2013-08-01 Frederik "Freso" S. Olesen <archlinux@freso.dk>
 
 	* 4.2.0-1
diff --git a/PKGBUILD b/PKGBUILD
index 6ed812e064e0..ea1b56b0dc4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mcpatcher
 pkgver='4.2.0'
-pkgrel=1
+pkgrel=2
 pkgdesc='Minecraft patcher to fix textures with higher than default resolution'
 arch=('any')
 license=('Public Domain')
@@ -16,8 +16,8 @@ source=(https://bitbucket.org/prupe/mcpatcher/downloads/$pkgname-$pkgver.jar
         mcpatcher
         mcpatcher.desktop)
 md5sums=('552cc0ea875032a5e15c395debdc8869'
-         '38358254be76dc84676509f43be44938'
-         '87f031f8f0fceb0feb369c6185e07fbf')
+         '9ec7aafefe59c2864b70f61d8661113d'
+         '5bcaba0e9fbc3a22159c17a64c7688fd')
 
 prepare() {
     cd "$srcdir"
@@ -32,7 +32,7 @@ package() {
     install -vDm755 'mcpatcher'            "$pkgdir/usr/bin/mcpatcher"
     install -vDm644 'resources/icon.png'   "$pkgdir/usr/share/pixmaps/mcpatcher.png"
     install -vDm644 'mcpatcher.desktop'    "$pkgdir/usr/share/applications/mcpatcher.desktop"
-    install -vDm644 "$pkgname-$pkgver.jar" "$pkgdir/usr/share/$pkgname/mcpatcher.jar"
+    install -vDm644 "$pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$pkgname/mcpatcher.jar"
 }
 
 # vim:set ts=4 sw=4 et:
diff --git a/mcpatcher b/mcpatcher
index 2daeb3870953..a7a900bb5edb 100755
--- a/mcpatcher
+++ b/mcpatcher
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-java -Xmx512m -jar /usr/share/mcpatcher/mcpatcher.jar
+java -Xmx512m -jar /usr/share/java/mcpatcher/mcpatcher.jar
diff --git a/mcpatcher.desktop b/mcpatcher.desktop
index 6345f442130a..433580a63124 100644
--- a/mcpatcher.desktop
+++ b/mcpatcher.desktop
@@ -4,7 +4,7 @@ Version=1.0
 Name=MCPatcher
 Comment=Minecraft patcher for HD textures and more.
 TryExec=mcpatcher
-Exec=java -Xmx512m -jar /usr/share/mcpatcher/mcpatcher.jar
+Exec=java -Xmx512m -jar /usr/share/java/mcpatcher/mcpatcher.jar
 Icon=/usr/share/pixmaps/mcpatcher.png
 Terminal=false
 Categories=Game;