summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD20
-rw-r--r--josm.jnlp27
3 files changed, 15 insertions, 45 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fe67b3432085..46d21b518efc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = josm-javaws
- pkgdesc = An editor for OpenStreetMap written in Java, Java Web Start version
- pkgver = 2014112501
- pkgrel = 3
+ pkgdesc = An editor for OpenStreetMap written in Java, Java Web Start version (auto updates on startup)
+ pkgver = tested
+ pkgrel = 2
url = http://josm.openstreetmap.de/
arch = any
license = GPL
@@ -13,15 +13,14 @@ pkgbase = josm-javaws
conflicts = josm
backup = etc/conf.d/josm
source = https://josm.openstreetmap.de/download/josm.jnlp
- source = http://josm.openstreetmap.de/browser/trunk/images/logo.png?format=raw
+ source = https://josm.openstreetmap.de/logo.png
source = josm.desktop
source = josm
source = josm.conf.d
- sha256sums = 6b33e9cce9f61375312c504e7f4328ce9663705bc4fa813effd1fb8b46c59dc0
- sha256sums = 40c72fcb1378fbc939b361af802f0aa0eda8688fa9541e1ac2bcf7524c0628e1
+ sha256sums = a4b196bfe34796c76441586abadafd4e48478caef3debb8248021d3f6ba906fe
+ sha256sums = 4f7ac6e53fe4660a69b183b0d46596f9ee496d4736a2652326c64ebc5e3023fb
sha256sums = edfb2cbf2aa7e6582b4d43cd402ea58be7990702e5ffffc3ff7afdc518c28ca9
sha256sums = 345bc3e4436f93f4980051ccec226224fa8d6b513cde8da98294cc3b4bcdc9dc
sha256sums = c86a73251eed42fcb129ae9b88a0ee3cf03d8d00a9385519ad536d5af0907663
pkgname = josm-javaws
-
diff --git a/PKGBUILD b/PKGBUILD
index 9d45f9019941..159a67c6f250 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer: Brian "Beej Jorgensen" Hall <beej@beej.us>
+# Maintainer: Thibault Molleman <aur at thibaultmol d0t link>
+# Contributor: Brian "Beej Jorgensen" Hall <beej@beej.us>
pkgname=josm-javaws
-pkgver=2014112501
-pkgrel=3
-pkgdesc="An editor for OpenStreetMap written in Java, Java Web Start version"
+pkgver='tested'
+pkgrel=2
+pkgdesc="An editor for OpenStreetMap written in Java, Java Web Start version (auto updates on startup)"
arch=('any')
url="http://josm.openstreetmap.de/"
license=('GPL')
@@ -12,13 +13,13 @@ backup=('etc/conf.d/josm')
provides=('josm')
conflicts=('josm')
source=('https://josm.openstreetmap.de/download/josm.jnlp'
- 'http://josm.openstreetmap.de/browser/trunk/images/logo.png?format=raw'
+ 'https://josm.openstreetmap.de/logo.png'
'josm.desktop'
'josm'
'josm.conf.d')
-sha256sums=('6b33e9cce9f61375312c504e7f4328ce9663705bc4fa813effd1fb8b46c59dc0'
- '279c03847dd270a2e9fc07937498af5418960e3636f8f9919125d60805b799a4'
+sha256sums=('a4b196bfe34796c76441586abadafd4e48478caef3debb8248021d3f6ba906fe'
+ '4f7ac6e53fe4660a69b183b0d46596f9ee496d4736a2652326c64ebc5e3023fb'
'edfb2cbf2aa7e6582b4d43cd402ea58be7990702e5ffffc3ff7afdc518c28ca9'
'345bc3e4436f93f4980051ccec226224fa8d6b513cde8da98294cc3b4bcdc9dc'
'c86a73251eed42fcb129ae9b88a0ee3cf03d8d00a9385519ad536d5af0907663')
@@ -28,10 +29,7 @@ package() {
install -D -m644 josm.jnlp "${pkgdir}"/usr/share/java/josm/josm.jnlp
install -D -m644 "${srcdir}"/josm.desktop ${pkgdir}/usr/share/applications/josm.desktop
- install -D -m644 'logo.png?format=raw' "${pkgdir}"/usr/share/pixmaps/josm.png
+ install -D -m644 'logo.png' "${pkgdir}"/usr/share/pixmaps/josm.png
install -D -m755 josm "${pkgdir}"/usr/bin/josm
install -Dm644 "${srcdir}"/josm.conf.d "${pkgdir}"/etc/conf.d/josm
}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/josm.jnlp b/josm.jnlp
deleted file mode 100644
index 7d18394a4cef..000000000000
--- a/josm.jnlp
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 6.0//EN" "http://java.sun.com/dtd/JNLP-6.0.dtd">
-<jnlp spec="6.0+" codebase="https://josm.openstreetmap.de/download/" href="josm.jnlp">
- <information>
- <title>JOSM</title>
- <vendor>OpenStreetMap</vendor>
- <homepage href="https://josm.openstreetmap.de"/>
- <description>Java OpenStreetMap editor</description>
- <description kind="one-line">JOSM</description>
- <description kind="tooltip">JOSM</description>
- <icon href="https://josm.openstreetmap.de/svn/trunk/images/logo.png"/>
- <offline-allowed/>
- <shortcut>
- <desktop/>
- <menu/>
- </shortcut>
- </information>
- <security>
- <all-permissions/>
- </security>
- <resources>
- <j2se version="1.6+"/>
- <jar href="josm-tested.jar"/>
- <property name="java.util.Arrays.useLegacyMergeSort" value="true"/>
- </resources>
- <application-desc main-class="JOSM"/>
-</jnlp> \ No newline at end of file