update to 23.01

3 files changed, 48 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0dfd8c25cb67..8a2ebcbfa73d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = josm-stable
 	pkgdesc = An editor for OpenStreetMap written in Java. Stable releases
-	pkgver = 22.12
-	pkgrel = 2
+	pkgver = 23.01
+	pkgrel = 1
 	url = https://josm.openstreetmap.de/
 	changelog = changelog
 	arch = any
@@ -13,32 +13,32 @@ pkgbase = josm-stable
 	provides = josm
 	conflicts = josm
 	conflicts = josm-tested
-	noextract = josm-snapshot-18622.jar
+	noextract = josm-snapshot-18646.jar
 	backup = etc/conf.d/josm
-	source = https://josm.openstreetmap.de/download/josm-snapshot-18622.jar
+	source = https://josm.openstreetmap.de/download/josm-snapshot-18646.jar
 	source = josm.conf.d
-	source = https://josm.openstreetmap.de/export/18622/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
-	source = https://josm.openstreetmap.de/export/18622/josm/trunk/native/linux/tested/usr/share/man/man1/josm.1
-	source = https://josm.openstreetmap.de/export/18622/josm/trunk/native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
-	source = https://josm.openstreetmap.de/export/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/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/18622/josm/trunk/native/linux/tested/usr/share/icons/hicolor/512x512/apps/org.openstreetmap.josm.png
-	b2sums = 01d033cb4105f192ef14176dca79667ef2df95a55507df47dd5d163025d7460246fcc5524133e08e9ee77ee3073dce819072470d3898620d7ed9c5eedd405a34
+	source = https://josm.openstreetmap.de/export/18646/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
+	source = https://josm.openstreetmap.de/export/18646/josm/trunk/native/linux/tested/usr/share/man/man1/josm.1
+	source = https://josm.openstreetmap.de/export/18646/josm/trunk/native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
+	source = https://josm.openstreetmap.de/export/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/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/18646/josm/trunk/native/linux/tested/usr/share/icons/hicolor/512x512/apps/org.openstreetmap.josm.png
+	b2sums = 8735298e268f2b516f235e7368a44e638455dffc9ab5d8c07672bb2053227bb15473cd71ce1f8b08e3e3dc43ed4c240aab8a9f2b4632cf6d59a30a49a70302a6
 	b2sums = 6ab22295febf20e8124da5f224d28722210345b33a091b948dd02e1897ab7767cdf6b65ee42bf777f3d52dfb88e14b7af9a013ee60e6949964618bb33416b6ee
 	b2sums = d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7
 	b2sums = 095c9a52e8efaf90a41d322c89cee6828ff05a20999a864f438e1b8c101382588e58f455f8339235493a27a16326b9114add69aeab9709e9bf8a28d1ce5594d5
diff --git a/PKGBUILD b/PKGBUILD
index 8cde77134f5f..0e65e36d72fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=josm-stable
 _name=josm
 _app_id="org.openstreetmap.${_name}"
-pkgver=22.12 # REMEMBER TO UPDATE CHANGELOG!
-pkgrel=2
-_commit_id=18622
+pkgver=23.01 # REMEMBER TO UPDATE CHANGELOG!
+pkgrel=1
+_commit_id=18646
 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=('01d033cb4105f192ef14176dca79667ef2df95a55507df47dd5d163025d7460246fcc5524133e08e9ee77ee3073dce819072470d3898620d7ed9c5eedd405a34'
+b2sums=('8735298e268f2b516f235e7368a44e638455dffc9ab5d8c07672bb2053227bb15473cd71ce1f8b08e3e3dc43ed4c240aab8a9f2b4632cf6d59a30a49a70302a6'
         '6ab22295febf20e8124da5f224d28722210345b33a091b948dd02e1897ab7767cdf6b65ee42bf777f3d52dfb88e14b7af9a013ee60e6949964618bb33416b6ee'
         'd3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7'
         '095c9a52e8efaf90a41d322c89cee6828ff05a20999a864f438e1b8c101382588e58f455f8339235493a27a16326b9114add69aeab9709e9bf8a28d1ce5594d5'
diff --git a/changelog b/changelog
index 891c11162957..78269ce9a448 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,21 @@
+# 2023-01-30: Stable release 18646 (23.01)
+
+Medium enhancements
+        Fix #21423: Prevent validation error codes from clashing. Note that the full effect of this change will not be visible until 2024-01-01 for backwards/forwards compatibility reasons.
+            See #18230: Move RightAngleBuildingTest error code to 4101 from 3701 -- this is due to a conflict with with pt_assistant, and all ignored entries with the group 3701 will be removed. 
+Add/improve/fix/change Internal Presets, Map Paint Style and Validation rules
+        Fix #21878: Add building types riding_hall and sports_hall
+        Fix #22588: Improve horse related presets (patch by Hufkratzer)
+        Fix #18626: Warn about amenity=marketplace together with highway
+        Fix #22574: Add amenity=animal_breeding and add Animal group in Facilities
+        Fix #22630: Add crossing:markings to the crossing preset (patch by Woazboat)
+        Fix #22561: Change site_type to archaeological_site (site_type has been deprecated since 2022-12-04)
+        Fix #22599: Add colour:back to City Limit Sign preset
+        Fix #22481: Deprecated building:level in favor of building:levels (not the trailing s)
+        Fix #22473: Don't warn about Way end node near other way for natural=arete and natural=ridge
+        Fix #20539, see #18659, see #18719 - Deprecate car in favor for motorcar also for non charging stations 
+More minor bug fixes, enhancements, stability improvements, translation updates, code improvements and code documentation, see SVN log messages of milestone 23.01 
+
 # 2023-01-04: Hotfix release 18622 for 22.12
 
 Medium enhancements