update to 23.03

3 files changed, 38 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f8a4048452a..0504f089c75f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = josm-stable
 	pkgdesc = An editor for OpenStreetMap written in Java. Stable releases
-	pkgver = 23.02
+	pkgver = 23.03
 	pkgrel = 1
 	url = https://josm.openstreetmap.de/
 	changelog = changelog
@@ -13,32 +13,32 @@ pkgbase = josm-stable
 	provides = josm
 	conflicts = josm
 	conflicts = josm-tested
-	noextract = josm-snapshot-18678.jar
+	noextract = josm-snapshot-18700.jar
 	backup = etc/conf.d/josm
-	source = https://josm.openstreetmap.de/download/josm-snapshot-18678.jar
+	source = https://josm.openstreetmap.de/download/josm-snapshot-18700.jar
 	source = josm.conf.d
-	source = https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
-	source = https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/man/man1/josm.1
-	source = https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
-	source = https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg
-	source = 8x8_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/8x8/apps/org.openstreetmap.josm.png
-	source = 16x16_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/16x16/apps/org.openstreetmap.josm.png
-	source = 22x22_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/22x22/apps/org.openstreetmap.josm.png
-	source = 24x24_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/24x24/apps/org.openstreetmap.josm.png
-	source = 32x32_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/32x32/apps/org.openstreetmap.josm.png
-	source = 36x36_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/36x36/apps/org.openstreetmap.josm.png
-	source = 40x40_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/40x40/apps/org.openstreetmap.josm.png
-	source = 42x42_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/42x42/apps/org.openstreetmap.josm.png
-	source = 48x48_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/48x48/apps/org.openstreetmap.josm.png
-	source = 64x64_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/64x64/apps/org.openstreetmap.josm.png
-	source = 72x72_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/72x72/apps/org.openstreetmap.josm.png
-	source = 80x80_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/80x80/apps/org.openstreetmap.josm.png
-	source = 96x96_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/96x96/apps/org.openstreetmap.josm.png
-	source = 128x128_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/128x128/apps/org.openstreetmap.josm.png
-	source = 192x192_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/192x192/apps/org.openstreetmap.josm.png
-	source = 256x256_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/256x256/apps/org.openstreetmap.josm.png
-	source = 512x512_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18678/josm/trunk/native/linux/tested/usr/share/icons/hicolor/512x512/apps/org.openstreetmap.josm.png
-	b2sums = 9db4a9bd90e0f2deac4474462091d91505874f936fde330c6a676d4beecf029966d692bc2dadc0f2d44bfcb53d8f40a075a95d0bb4b07f6ffffb160080d88ceb
+	source = https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
+	source = https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/man/man1/josm.1
+	source = https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
+	source = https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg
+	source = 8x8_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/8x8/apps/org.openstreetmap.josm.png
+	source = 16x16_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/16x16/apps/org.openstreetmap.josm.png
+	source = 22x22_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/22x22/apps/org.openstreetmap.josm.png
+	source = 24x24_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/24x24/apps/org.openstreetmap.josm.png
+	source = 32x32_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/32x32/apps/org.openstreetmap.josm.png
+	source = 36x36_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/36x36/apps/org.openstreetmap.josm.png
+	source = 40x40_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/40x40/apps/org.openstreetmap.josm.png
+	source = 42x42_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/42x42/apps/org.openstreetmap.josm.png
+	source = 48x48_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/48x48/apps/org.openstreetmap.josm.png
+	source = 64x64_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/64x64/apps/org.openstreetmap.josm.png
+	source = 72x72_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/72x72/apps/org.openstreetmap.josm.png
+	source = 80x80_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/80x80/apps/org.openstreetmap.josm.png
+	source = 96x96_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/96x96/apps/org.openstreetmap.josm.png
+	source = 128x128_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/128x128/apps/org.openstreetmap.josm.png
+	source = 192x192_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/192x192/apps/org.openstreetmap.josm.png
+	source = 256x256_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/256x256/apps/org.openstreetmap.josm.png
+	source = 512x512_org.openstreetmap.josm.png::https://josm.openstreetmap.de/export/18700/josm/trunk/native/linux/tested/usr/share/icons/hicolor/512x512/apps/org.openstreetmap.josm.png
+	b2sums = 67310f9e1d2b64646f543573ee9aacac6f62ff40597e069e756d34bf4699755712bccf5dca8bd89c8185db5a470dd3d1c4242b02534e416fe04c62ca7f994de2
 	b2sums = 6ab22295febf20e8124da5f224d28722210345b33a091b948dd02e1897ab7767cdf6b65ee42bf777f3d52dfb88e14b7af9a013ee60e6949964618bb33416b6ee
 	b2sums = d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7
 	b2sums = 095c9a52e8efaf90a41d322c89cee6828ff05a20999a864f438e1b8c101382588e58f455f8339235493a27a16326b9114add69aeab9709e9bf8a28d1ce5594d5
diff --git a/PKGBUILD b/PKGBUILD
index 325d7c62b4c7..1e46cc1d33eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=josm-stable
 _name=josm
 _app_id="org.openstreetmap.${_name}"
-pkgver=23.02 # REMEMBER TO UPDATE CHANGELOG!
+pkgver=23.03 # REMEMBER TO UPDATE CHANGELOG!
 pkgrel=1
-_commit_id=18678
+_commit_id=18700
 pkgdesc="An editor for OpenStreetMap written in Java. Stable releases"
 arch=('any')
 url="https://josm.openstreetmap.de/"
@@ -33,7 +33,7 @@ done
 source=("${source[@]}" "${source_icons[@]}")
 
 noextract=(${_name}-snapshot-${_commit_id}.jar)
-b2sums=('9db4a9bd90e0f2deac4474462091d91505874f936fde330c6a676d4beecf029966d692bc2dadc0f2d44bfcb53d8f40a075a95d0bb4b07f6ffffb160080d88ceb'
+b2sums=('67310f9e1d2b64646f543573ee9aacac6f62ff40597e069e756d34bf4699755712bccf5dca8bd89c8185db5a470dd3d1c4242b02534e416fe04c62ca7f994de2'
         '6ab22295febf20e8124da5f224d28722210345b33a091b948dd02e1897ab7767cdf6b65ee42bf777f3d52dfb88e14b7af9a013ee60e6949964618bb33416b6ee'
         'd3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7'
         '095c9a52e8efaf90a41d322c89cee6828ff05a20999a864f438e1b8c101382588e58f455f8339235493a27a16326b9114add69aeab9709e9bf8a28d1ce5594d5'
diff --git a/changelog b/changelog
index 68ac20604b38..40b7946c0cb3 100644
--- a/changelog
+++ b/changelog
@@ -1,12 +1,13 @@
-# 2023-03-02: Stable release 18678 (23.02)
+# 2023-04-03: Stable release 18700 (23.03)
 
-Major enhancements
-	Fix #20768: Add OAuth 2.0 support 
-Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
-	Fix #22547: tunnel=culvert should have waterway=* or man_made=tunnel (patch by skyper)
-	Fix #22761: Don't warn about "value '<some value>' for key 'ref' not in presets"
-	Partially fix #21778: oneway + .*:(backward|forward):conditional should not have a warning (patch by Famlam) 
+## Medium enhancements
 
-More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 23.02:
+- PBF read support (see #22603) 
 
-https://josm.openstreetmap.de/log/josm/?rev=18678&stop_rev=18647
+## Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
+
+- Fix #22792: Add natural=shrubbery (icons from JeroenHoek, patch by JeroenHoek) 
+
+## More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 23.03:
+
+https://josm.openstreetmap.de/log/josm/?rev=18700&stop_rev=18679