[josm] 01/02: Merge tag 'debian/0.0.svn13367+dfsg-1' into stretch-backports
Bas Couwenberg
sebastic at debian.org
Sat Feb 3 06:56:56 UTC 2018
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch stretch-backports
in repository josm.
commit dd2ec18085c468af9ee511f5d1e62fba584524a4
Merge: 95a3569 25c3821
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Feb 3 07:43:26 2018 +0100
Merge tag 'debian/0.0.svn13367+dfsg-1' into stretch-backports
.classpath | 6 +-
.settings/org.eclipse.core.resources.prefs | 1 +
CONTRIBUTION | 4 +
README | 62 +-
REVISION | 6 +-
appveyor.yml | 2 -
build.xml | 22 +-
data/defaultpresets.xml | 48 +-
data/maps.xsd | 4 +-
data/validator/combinations.mapcss | 2 +-
data/validator/deprecated.mapcss | 44 +
data/validator/ignoretags.cfg | 5 +-
data/validator/numeric.mapcss | 129 +-
data/validator/unnecessary.mapcss | 2 +-
data_nodist/csv.style | 8 -
debian/changelog | 12 +
debian/control | 6 +-
debian/copyright | 56 +-
debian/patches/00-build.patch | 30 +-
eclipse/JOSM (Java 8).launch | 2 +-
i18n/build.xml | 37 +-
i18n/i18n.pl | 1 +
i18n/langinfo.pl | 1 +
i18n/po/af.po | 1253 +++++-------
i18n/po/am.po | 1253 +++++-------
i18n/po/ar.po | 1255 +++++-------
i18n/po/ast.po | 1283 +++++-------
i18n/po/az.po | 1253 +++++-------
i18n/po/be.po | 1330 +++++--------
i18n/po/bg.po | 1297 +++++-------
i18n/po/bn.po | 1253 +++++-------
i18n/po/br.po | 1253 +++++-------
i18n/po/bs.po | 1253 +++++-------
i18n/po/ca.po | 1289 +++++-------
i18n/po/ca at valencia.po | 1279 +++++-------
i18n/po/cs.po | 1549 ++++++--------
i18n/po/cy.po | 1253 +++++-------
i18n/po/da.po | 1529 ++++++--------
i18n/po/de.po | 1578 ++++++---------
i18n/po/de_DE.po | 1255 +++++-------
i18n/po/el.po | 1267 +++++-------
i18n/po/en_AU.po | 1257 +++++-------
i18n/po/en_CA.po | 1255 +++++-------
i18n/po/en_GB.po | 1683 +++++++---------
i18n/po/eo.po | 1255 +++++-------
i18n/po/es.po | 1980 +++++++++---------
i18n/po/et.po | 1257 +++++-------
i18n/po/eu.po | 1257 +++++-------
i18n/po/fa.po | 1255 +++++-------
i18n/po/fi.po | 1275 +++++-------
i18n/po/fil.po | 1253 +++++-------
i18n/po/fo.po | 1253 +++++-------
i18n/po/fr.po | 1538 ++++++--------
i18n/po/ga.po | 1253 +++++-------
i18n/po/gl.po | 1257 +++++-------
i18n/po/he.po | 1255 +++++-------
i18n/po/hi.po | 1253 +++++-------
i18n/po/hr.po | 1255 +++++-------
i18n/po/ht.po | 1253 +++++-------
i18n/po/hu.po | 1418 ++++++-------
i18n/po/hy.po | 1253 +++++-------
i18n/po/ia.po | 1253 +++++-------
i18n/po/id.po | 2105 +++++++++-----------
i18n/po/is.po | 1255 +++++-------
i18n/po/it.po | 1301 +++++-------
i18n/po/ja.po | 1502 ++++++--------
i18n/po/ka.po | 1255 +++++-------
i18n/po/km.po | 1259 +++++-------
i18n/po/ko.po | 1255 +++++-------
i18n/po/ku.po | 1253 +++++-------
i18n/po/ky.po | 1253 +++++-------
i18n/po/lb.po | 1253 +++++-------
i18n/po/lo.po | 1253 +++++-------
i18n/po/lt.po | 1293 +++++-------
i18n/po/lv.po | 1255 +++++-------
i18n/po/mk.po | 1253 +++++-------
i18n/po/mr.po | 1255 +++++-------
i18n/po/ms.po | 1253 +++++-------
i18n/po/nb.po | 1255 +++++-------
i18n/po/nds.po | 1253 +++++-------
i18n/po/nl.po | 1674 +++++++---------
i18n/po/nn.po | 1253 +++++-------
i18n/po/oc.po | 1255 +++++-------
i18n/po/pa.po | 1253 +++++-------
i18n/po/pl.po | 1431 ++++++-------
i18n/po/pt.po | 1346 +++++--------
i18n/po/pt_BR.po | 1602 +++++++--------
i18n/po/rm.po | 1253 +++++-------
i18n/po/ro.po | 1255 +++++-------
i18n/po/ru.po | 1534 ++++++--------
i18n/po/sk.po | 1472 ++++++--------
i18n/po/sl.po | 1255 +++++-------
i18n/po/sq.po | 1253 +++++-------
i18n/po/sr.po | 1255 +++++-------
i18n/po/sv.po | 1255 +++++-------
i18n/po/ta.po | 1255 +++++-------
i18n/po/te.po | 1253 +++++-------
i18n/po/th.po | 1253 +++++-------
i18n/po/tr.po | 1255 +++++-------
i18n/po/ug.po | 1253 +++++-------
i18n/po/uk.po | 1534 ++++++--------
i18n/po/ur.po | 1253 +++++-------
i18n/po/vi.po | 1284 +++++-------
i18n/po/wae.po | 1253 +++++-------
i18n/po/zh_CN.po | 1412 ++++++-------
i18n/po/zh_TW.po | 1267 +++++-------
images/gps-lines.png | Bin 564 -> 0 bytes
images/layer-switcher-maximize.png | Bin 287 -> 0 bytes
images/layer-switcher-minimize.png | Bin 203 -> 0 bytes
images/presets/craft/beekeeper.svg | 98 +-
images/presets/craft/painter.svg | 605 ++++--
images/presets/education/library.svg | 424 +---
images/presets/education/school.svg | 302 +--
images/presets/misc/angles.svg | 34 +-
images/statusline/angle.png | Bin 191 -> 0 bytes
images/statusline/angle.svg | 5 +
images/statusline/dist.png | Bin 102 -> 0 bytes
images/statusline/dist.svg | 4 +
images/statusline/heading.png | Bin 410 -> 0 bytes
images/statusline/heading.svg | 5 +
images/statusline/lat.png | Bin 365 -> 0 bytes
images/statusline/lat.svg | 5 +
images/statusline/lon.png | Bin 370 -> 0 bytes
images/statusline/lon.svg | 5 +
netbeans/nbproject/project.properties | 8 +-
resources/org/glassfish/json/messages.properties | 85 +-
geticons.pl => scripts/geticons.pl | 50 +-
optimize-images => scripts/optimize-images | 0
src/org/glassfish/json/messages.properties | 112 --
src/org/openstreetmap/josm/Main.java | 44 +-
.../josm/actions/CloseChangesetAction.java | 8 +
.../josm/actions/ExtensionFileFilter.java | 15 +-
.../josm/actions/ImageryAdjustAction.java | 31 +-
src/org/openstreetmap/josm/actions/MoveAction.java | 2 +-
.../josm/actions/OpenLocationAction.java | 2 +-
src/org/openstreetmap/josm/actions/SaveAction.java | 4 +
.../openstreetmap/josm/actions/SaveAsAction.java | 4 +
.../josm/actions/UnJoinNodeWayAction.java | 2 +-
.../actions/downloadtasks/DownloadNotesTask.java | 16 +-
.../DownloadOsmChangeCompressedTask.java | 17 +-
.../downloadtasks/DownloadOsmCompressedTask.java | 18 +-
.../josm/actions/mapmode/DrawAction.java | 122 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 14 +-
.../josm/actions/mapmode/MapMode.java | 2 +
.../josm/actions/mapmode/SelectAction.java | 32 +-
.../relation/ExportRelationToGpxAction.java | 4 +-
.../actions/relation/RecentRelationsAction.java | 8 +-
.../josm/actions/search/SearchAction.java | 4 +-
src/org/openstreetmap/josm/data/Preferences.java | 41 -
.../josm/data/cache/JCSCachedTileLoaderJob.java | 11 +-
.../josm/data/imagery/ImageryInfo.java | 1 +
.../josm/data/osm/AbstractPrimitive.java | 5 +
src/org/openstreetmap/josm/data/osm/DataSet.java | 10 +
.../openstreetmap/josm/data/osm/FilterMatcher.java | 6 +-
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 18 +
.../openstreetmap/josm/data/osm/QuadBuckets.java | 3 +
.../josm/data/osm/search/SearchCompiler.java | 5 +-
.../data/validation/routines/DomainValidator.java | 4 +-
.../josm/data/validation/tests/Highways.java | 3 +-
.../data/validation/tests/MapCSSTagChecker.java | 5 +-
.../data/validation/tests/OpeningHourTest.java | 67 +-
.../openstreetmap/josm/gui/MainApplication.java | 13 +-
src/org/openstreetmap/josm/gui/ScrollViewport.java | 8 +-
.../josm/gui/bugreport/BugReportDialog.java | 14 +-
.../josm/gui/dialogs/ConflictDialog.java | 8 +-
.../josm/gui/dialogs/LayerListDialog.java | 4 -
.../ChangesetContentTableCellRenderer.java | 8 +-
.../josm/gui/download/DownloadObjectDialog.java | 2 +-
.../josm/gui/download/OverpassDownloadSource.java | 2 +-
.../gui/download/OverpassQueryWizardDialog.java | 7 +-
.../josm/gui/io/CustomConfigurator.java | 6 +-
.../josm/gui/io/importexport/NoteImporter.java | 2 +-
.../josm/gui/io/importexport/OsmExporter.java | 2 +-
.../josm/gui/io/importexport/OsmImporter.java | 4 +-
.../josm/gui/io/importexport/OsmXzExporter.java | 24 +
.../josm/gui/layer/AbstractTileSourceLayer.java | 3 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 6 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 1 +
.../josm/gui/layer/geoimage/ImageDisplay.java | 20 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 8 +-
.../josm/gui/layer/markerlayer/AudioMarker.java | 2 +-
.../josm/gui/layer/markerlayer/ImageMarker.java | 2 +-
.../josm/gui/layer/markerlayer/PlayHeadMarker.java | 2 +-
.../josm/gui/layer/markerlayer/WebMarker.java | 2 +-
.../josm/gui/mappaint/StyleCache.java | 5 +
.../gui/mappaint/styleelement/AreaElement.java | 11 +-
.../remotecontrol/RemoteControlPreference.java | 2 +-
.../gui/tagging/presets/TaggingPresetReader.java | 16 +
.../josm/gui/tagging/presets/items/PresetLink.java | 5 +
.../josm/gui/tagging/presets/items/Roles.java | 16 +-
.../josm/gui/util/AdvancedKeyPressDetector.java | 1 +
src/org/openstreetmap/josm/io/Compression.java | 30 +-
.../josm/io/OsmServerLocationReader.java | 51 +-
src/org/openstreetmap/josm/io/OsmServerReader.java | 101 +-
.../josm/io/OverpassDownloadReader.java | 12 +
.../josm/io/imagery/ImageryReader.java | 6 +-
.../openstreetmap/josm/io/imagery/WMSImagery.java | 86 +-
.../josm/plugins/PluginDownloadTask.java | 2 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 34 +-
src/org/openstreetmap/josm/tools/HttpClient.java | 19 +
src/org/openstreetmap/josm/tools/I18n.java | 4 +-
.../openstreetmap/josm/tools/ImageProvider.java | 32 +-
.../josm/tools/OverpassTurboQueryWizard.java | 31 +-
.../josm/tools/SAXReturnException.java | 17 +
src/org/openstreetmap/josm/tools/Utils.java | 82 +-
src/org/tukaani/xz/ArrayCache.java | 172 ++
src/org/tukaani/xz/BCJCoder.java | 35 +
src/org/tukaani/xz/BCJDecoder.java | 62 +
src/org/tukaani/xz/BasicArrayCache.java | 281 +++
src/org/tukaani/xz/BlockInputStream.java | 305 +++
src/org/tukaani/xz/BlockOutputStream.java | 135 ++
src/org/tukaani/xz/CloseIgnoringInputStream.java | 48 +
src/org/tukaani/xz/CorruptedInputException.java | 37 +
src/org/tukaani/xz/CountingInputStream.java | 47 +
src/org/tukaani/xz/CountingOutputStream.java | 54 +
src/org/tukaani/xz/DeltaCoder.java | 26 +
src/org/tukaani/xz/DeltaDecoder.java | 32 +
src/org/tukaani/xz/DeltaEncoder.java | 37 +
src/org/tukaani/xz/DeltaInputStream.java | 146 ++
src/org/tukaani/xz/DeltaOptions.java | 103 +
src/org/tukaani/xz/DeltaOutputStream.java | 113 ++
src/org/tukaani/xz/FilterCoder.java | 16 +
src/org/tukaani/xz/FilterDecoder.java | 17 +
src/org/tukaani/xz/FilterEncoder.java | 18 +
src/org/tukaani/xz/FilterOptions.java | 104 +
src/org/tukaani/xz/FinishableOutputStream.java | 31 +
src/org/tukaani/xz/IndexIndicatorException.java | 14 +
src/org/tukaani/xz/LZMA2Coder.java | 26 +
src/org/tukaani/xz/LZMA2Decoder.java | 35 +
src/org/tukaani/xz/LZMA2Encoder.java | 51 +
src/org/tukaani/xz/LZMA2InputStream.java | 400 ++++
src/org/tukaani/xz/LZMA2Options.java | 583 ++++++
src/org/tukaani/xz/LZMA2OutputStream.java | 270 +++
src/org/tukaani/xz/MemoryLimitException.java | 60 +
src/org/tukaani/xz/RawCoder.java | 33 +
src/org/tukaani/xz/SeekableInputStream.java | 81 +
src/org/tukaani/xz/SimpleInputStream.java | 138 ++
src/org/tukaani/xz/SingleXZInputStream.java | 535 +++++
.../tukaani/xz/UncompressedLZMA2OutputStream.java | 164 ++
.../tukaani/xz/UnsupportedOptionsException.java | 34 +
src/org/tukaani/xz/XZ.java | 53 +
src/org/tukaani/xz/XZFormatException.java | 24 +
src/org/tukaani/xz/XZIOException.java | 27 +
src/org/tukaani/xz/XZInputStream.java | 527 +++++
src/org/tukaani/xz/XZOutputStream.java | 606 ++++++
src/org/tukaani/xz/check/CRC32.java | 33 +
src/org/tukaani/xz/check/CRC64.java | 54 +
src/org/tukaani/xz/check/Check.java | 57 +
src/org/tukaani/xz/check/None.java | 24 +
src/org/tukaani/xz/check/SHA256.java | 30 +
src/org/tukaani/xz/common/DecoderUtil.java | 121 ++
src/org/tukaani/xz/common/EncoderUtil.java | 36 +
src/org/tukaani/xz/common/StreamFlags.java | 15 +
src/org/tukaani/xz/common/Util.java | 28 +
src/org/tukaani/xz/delta/DeltaCoder.java | 27 +
src/org/tukaani/xz/delta/DeltaDecoder.java | 24 +
src/org/tukaani/xz/delta/DeltaEncoder.java | 24 +
src/org/tukaani/xz/index/BlockInfo.java | 38 +
src/org/tukaani/xz/index/IndexBase.java | 56 +
src/org/tukaani/xz/index/IndexDecoder.java | 223 +++
src/org/tukaani/xz/index/IndexEncoder.java | 59 +
src/org/tukaani/xz/index/IndexHash.java | 98 +
src/org/tukaani/xz/index/IndexRecord.java | 20 +
src/org/tukaani/xz/lz/BT4.java | 265 +++
src/org/tukaani/xz/lz/CRC32Hash.java | 35 +
src/org/tukaani/xz/lz/HC4.java | 210 ++
src/org/tukaani/xz/lz/Hash234.java | 102 +
src/org/tukaani/xz/lz/LZDecoder.java | 133 ++
src/org/tukaani/xz/lz/LZEncoder.java | 428 ++++
src/org/tukaani/xz/lz/Matches.java | 22 +
src/org/tukaani/xz/lzma/LZMACoder.java | 140 ++
src/org/tukaani/xz/lzma/LZMADecoder.java | 199 ++
src/org/tukaani/xz/lzma/LZMAEncoder.java | 750 +++++++
src/org/tukaani/xz/lzma/LZMAEncoderFast.java | 153 ++
src/org/tukaani/xz/lzma/LZMAEncoderNormal.java | 568 ++++++
src/org/tukaani/xz/lzma/Optimum.java | 73 +
src/org/tukaani/xz/lzma/State.java | 75 +
src/org/tukaani/xz/package-info.java | 45 +
src/org/tukaani/xz/rangecoder/RangeCoder.java | 26 +
src/org/tukaani/xz/rangecoder/RangeDecoder.java | 83 +
.../xz/rangecoder/RangeDecoderFromBuffer.java | 71 +
src/org/tukaani/xz/rangecoder/RangeEncoder.java | 200 ++
.../xz/rangecoder/RangeEncoderToBuffer.java | 59 +
src/org/tukaani/xz/simple/ARM.java | 50 +
src/org/tukaani/xz/simple/ARMThumb.java | 53 +
src/org/tukaani/xz/simple/IA64.java | 81 +
src/org/tukaani/xz/simple/PowerPC.java | 50 +
src/org/tukaani/xz/simple/SPARC.java | 56 +
src/org/tukaani/xz/simple/SimpleFilter.java | 14 +
src/org/tukaani/xz/simple/X86.java | 98 +
styles/standard/elemstyles.mapcss | 11 +
test/data/plugin/corrupted_plugin.MANIFEST.MF | 12 +
test/data/regress/15730/capabilities.xml | 86 +
.../openstreetmap/josm/tools/HttpClientTest.java | 26 +
test/unit/org/openstreetmap/josm/TestUtils.java | 16 +
.../josm/actions/ExtensionFileFilterTest.java | 14 +-
.../AbstractDownloadTaskTestParent.java | 11 +-
.../downloadtasks/PluginDownloadTaskTest.java | 163 ++
.../josm/actions/mapmode/DrawActionTest.java | 4 +-
.../data/cache/JCSCachedTileLoaderJobTest.java | 25 -
.../openstreetmap/josm/data/gpx/WayPointTest.java | 3 -
.../josm/data/osm/search/SearchCompilerTest.java | 20 +-
.../layer/geoimage/CorrelateGpxWithImagesTest.java | 14 +-
.../josm/io/OverpassDownloadReaderTest.java | 42 +
.../josm/io/imagery/WMSImageryTest.java | 20 +
.../josm/testutils/JOSMTestRules.java | 43 +-
tools/checkstyle/META-INF/MANIFEST.MF | 2 +-
307 files changed, 58043 insertions(+), 66457 deletions(-)
diff --cc debian/changelog
index 6468c4f,cbbed88..2acafe3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ josm (0.0.svn13367+dfsg-1) unstable; urgency=medium
+
+ * New tested snapshot.
+ * Update license for translations from BSD-3-Clause to GPL-2+ (same as JOSM).
+ * Bump Standards-Version to 4.1.3, no changes.
+ * Update copyright-format URL to use HTTPS.
+ * Add license & copyright for XZ Java sources.
+ * Refresh patches.
+ * Bump minimum required jmapviewer version to 2.5.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 29 Jan 2018 07:55:09 +0100
+
+josm (0.0.svn13265+dfsg-1~bpo9+1) stretch-backports; urgency=medium
+
+ * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 06 Jan 2018 09:57:49 +0100
+
josm (0.0.svn13265+dfsg-1) unstable; urgency=medium
* New tested snapshot.
diff --cc debian/control
index 0b41cff,691912a..93ae76f
--- a/debian/control
+++ b/debian/control
@@@ -21,9 -21,9 +21,9 @@@ Build-Depends: debhelper (>= 9~)
libsvgsalamander-java,
libterm-readkey-perl,
openjfx
- Standards-Version: 4.1.2
+ Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/josm.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/josm.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/josm.git -b stretch-backports
Homepage: https://josm.openstreetmap.de
Package: josm
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git
More information about the Pkg-grass-devel
mailing list