[josm] 01/02: Merge tag 'debian/0.0.svn13170+dfsg-2' into stretch-backports

Bas Couwenberg sebastic at debian.org
Sat Dec 2 17:39:31 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch stretch-backports
in repository josm.

commit 2340021988bbbe06f47b4fb164fbcbd54ab1c5f1
Merge: 8d65685 6aeb687
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 2 18:17:24 2017 +0100

    Merge tag 'debian/0.0.svn13170+dfsg-2' into stretch-backports

 .classpath                                         |    5 +-
 REVISION                                           |    8 +-
 build.xml                                          |   18 +-
 data/defaultpresets.xml                            |   48 +-
 data/validator/combinations.mapcss                 |   26 +-
 data/validator/geometry.mapcss                     |    9 +-
 data/validator/unnecessary.mapcss                  |    7 +
 debian/changelog                                   |   15 +
 debian/control                                     |    4 +-
 debian/copyright                                   |    3 +-
 debian/patches/00-build.patch                      |   30 +-
 debian/patches/04-use_system_jmapviewer.patch      |    2 +-
 debian/patches/05-fix_version.patch                |    2 +-
 debian/patches/06-move_data_out_of_jar.patch       |    2 +-
 debian/patches/series                              |    1 -
 ...pdate-multipolygon-action-no-longer-works.patch |   23 -
 eclipse/JOSM (Java 8).launch                       |    3 +-
 i18n/build.xml                                     |    4 +-
 i18n/convmaps.pl                                   |    2 +-
 i18n/convpreset.pl                                 |   11 +-
 i18n/convwiki.pl                                   |   14 +-
 i18n/po/af.po                                      |  358 ++--
 i18n/po/am.po                                      |  358 ++--
 i18n/po/ar.po                                      |  374 ++--
 i18n/po/ast.po                                     |  484 +++--
 i18n/po/az.po                                      |  358 ++--
 i18n/po/be.po                                      |  426 ++--
 i18n/po/bg.po                                      |  402 ++--
 i18n/po/bn.po                                      |  358 ++--
 i18n/po/br.po                                      |  358 ++--
 i18n/po/bs.po                                      |  358 ++--
 i18n/po/ca.po                                      |  426 ++--
 i18n/po/ca at valencia.po                             |  424 ++--
 i18n/po/cs.po                                      |  442 ++--
 i18n/po/cy.po                                      |  358 ++--
 i18n/po/da.po                                      |  442 ++--
 i18n/po/de.po                                      |  460 ++--
 i18n/po/de_DE.po                                   |  358 ++--
 i18n/po/el.po                                      |  404 ++--
 i18n/po/en_AU.po                                   |  392 ++--
 i18n/po/en_CA.po                                   |  358 ++--
 i18n/po/en_GB.po                                   |  474 +++--
 i18n/po/eo.po                                      |  358 ++--
 i18n/po/es.po                                      |  510 +++--
 i18n/po/et.po                                      |  402 ++--
 i18n/po/eu.po                                      |  377 ++--
 i18n/po/fa.po                                      |  360 ++--
 i18n/po/fi.po                                      |  394 ++--
 i18n/po/fil.po                                     |  358 ++--
 i18n/po/fo.po                                      |  358 ++--
 i18n/po/fr.po                                      | 1789 ++++++++++------
 i18n/po/ga.po                                      |  358 ++--
 i18n/po/gl.po                                      |  810 ++++----
 i18n/po/he.po                                      |  366 ++--
 i18n/po/hi.po                                      |  358 ++--
 i18n/po/hr.po                                      |  396 ++--
 i18n/po/ht.po                                      |  358 ++--
 i18n/po/hu.po                                      |  494 +++--
 i18n/po/hy.po                                      |  358 ++--
 i18n/po/ia.po                                      |  358 ++--
 i18n/po/id.po                                      | 2198 +++++++++++---------
 i18n/po/is.po                                      |  372 ++--
 i18n/po/it.po                                      |  431 ++--
 i18n/po/ja.po                                      |  417 ++--
 i18n/po/ka.po                                      |  358 ++--
 i18n/po/km.po                                      |  368 ++--
 i18n/po/ko.po                                      |  364 ++--
 i18n/po/ku.po                                      |  358 ++--
 i18n/po/ky.po                                      |  358 ++--
 i18n/po/lb.po                                      |  358 ++--
 i18n/po/lo.po                                      |  358 ++--
 i18n/po/lt.po                                      |  430 ++--
 i18n/po/lv.po                                      |  358 ++--
 i18n/po/mk.po                                      |  358 ++--
 i18n/po/mr.po                                      |  358 ++--
 i18n/po/ms.po                                      |  358 ++--
 i18n/po/nb.po                                      |  378 ++--
 i18n/po/nds.po                                     |  358 ++--
 i18n/po/nl.po                                      |  444 ++--
 i18n/po/nn.po                                      |  358 ++--
 i18n/po/oc.po                                      |  362 ++--
 i18n/po/pa.po                                      |  358 ++--
 i18n/po/pl.po                                      | 1560 ++++++++------
 i18n/po/pt.po                                      |  542 +++--
 i18n/po/pt_BR.po                                   |  432 ++--
 i18n/po/rm.po                                      |  358 ++--
 i18n/po/ro.po                                      |  362 ++--
 i18n/po/ru.po                                      |  460 ++--
 i18n/po/sk.po                                      |  416 ++--
 i18n/po/sl.po                                      |  362 ++--
 i18n/po/sq.po                                      |  358 ++--
 i18n/po/sr.po                                      |  358 ++--
 i18n/po/sv.po                                      |  396 ++--
 i18n/po/ta.po                                      |  364 ++--
 i18n/po/te.po                                      |  358 ++--
 i18n/po/th.po                                      |  358 ++--
 i18n/po/tr.po                                      |  392 ++--
 i18n/po/ug.po                                      |  358 ++--
 i18n/po/uk.po                                      |  463 +++--
 i18n/po/ur.po                                      |  358 ++--
 i18n/po/vi.po                                      |  422 ++--
 i18n/po/wae.po                                     |  358 ++--
 i18n/po/zh_CN.po                                   |  422 ++--
 i18n/po/zh_TW.po                                   |  414 ++--
 images/presets/barrier/kerb_pattern.svg            |   79 +
 netbeans/nbproject/project.properties              |   13 +-
 src/com/drew/imaging/ImageProcessingException.java |    2 +-
 src/com/drew/imaging/PhotographicConversions.java  |    2 +-
 src/com/drew/imaging/jpeg/JpegMetadataReader.java  |   10 +-
 .../drew/imaging/jpeg/JpegProcessingException.java |    2 +-
 src/com/drew/imaging/jpeg/JpegSegmentData.java     |    5 +-
 .../imaging/jpeg/JpegSegmentMetadataReader.java    |    4 +-
 src/com/drew/imaging/jpeg/JpegSegmentReader.java   |    2 +-
 src/com/drew/imaging/jpeg/JpegSegmentType.java     |   49 +-
 src/com/drew/imaging/jpeg/package-info.java        |    4 +
 src/com/drew/imaging/jpeg/package.html             |   33 -
 src/com/drew/imaging/package-info.java             |    5 +
 src/com/drew/imaging/package.html                  |   33 -
 src/com/drew/imaging/tiff/TiffDataFormat.java      |    2 +-
 src/com/drew/imaging/tiff/TiffHandler.java         |    7 +-
 .../drew/imaging/tiff/TiffProcessingException.java |    2 +-
 src/com/drew/imaging/tiff/TiffReader.java          |    6 +-
 src/com/drew/imaging/tiff/package-info.java        |    4 +
 src/com/drew/imaging/tiff/package.html             |   33 -
 src/com/drew/lang/BufferBoundsException.java       |    2 +-
 src/com/drew/lang/ByteArrayReader.java             |   38 +-
 .../Charsets.java}                                 |   22 +-
 src/com/drew/lang/CompoundException.java           |    2 +-
 src/com/drew/lang/GeoLocation.java                 |    2 +-
 src/com/drew/lang/RandomAccessReader.java          |   97 +-
 src/com/drew/lang/Rational.java                    |  119 +-
 src/com/drew/lang/SequentialByteArrayReader.java   |   27 +-
 src/com/drew/lang/SequentialReader.java            |   95 +-
 src/com/drew/lang/StreamReader.java                |   41 +-
 src/com/drew/lang/StringUtil.java                  |    4 +-
 src/com/drew/lang/annotations/NotNull.java         |    2 +-
 src/com/drew/lang/annotations/Nullable.java        |    2 +-
 .../{NotNull.java => SuppressWarnings.java}        |   19 +-
 src/com/drew/lang/annotations/package-info.java    |    5 +
 src/com/drew/lang/annotations/package.html         |   34 -
 src/com/drew/lang/package-info.java                |    4 +
 src/com/drew/lang/package.html                     |   33 -
 src/com/drew/metadata/Age.java                     |    7 +-
 src/com/drew/metadata/Directory.java               |  124 +-
 .../ExifIFD0Directory.java => ErrorDirectory.java} |   50 +-
 src/com/drew/metadata/Face.java                    |    2 +-
 src/com/drew/metadata/Metadata.java                |    4 +-
 src/com/drew/metadata/MetadataException.java       |    2 +-
 ...ileMetadataDescriptor.java => StringValue.java} |   58 +-
 src/com/drew/metadata/Tag.java                     |    4 +-
 src/com/drew/metadata/TagDescriptor.java           |  131 +-
 src/com/drew/metadata/exif/ExifDescriptorBase.java |  248 ++-
 src/com/drew/metadata/exif/ExifDirectoryBase.java  |   32 +-
 src/com/drew/metadata/exif/ExifIFD0Descriptor.java |    3 +-
 src/com/drew/metadata/exif/ExifIFD0Directory.java  |    3 +-
 ...IFDDescriptor.java => ExifImageDescriptor.java} |    9 +-
 ...teropDirectory.java => ExifImageDirectory.java} |   16 +-
 .../drew/metadata/exif/ExifInteropDescriptor.java  |    3 +-
 .../drew/metadata/exif/ExifInteropDirectory.java   |    3 +-
 src/com/drew/metadata/exif/ExifReader.java         |   23 +-
 .../drew/metadata/exif/ExifSubIFDDescriptor.java   |    3 +-
 .../drew/metadata/exif/ExifSubIFDDirectory.java    |   13 +-
 .../metadata/exif/ExifThumbnailDescriptor.java     |    3 +-
 .../drew/metadata/exif/ExifThumbnailDirectory.java |  242 +--
 src/com/drew/metadata/exif/ExifTiffHandler.java    |  548 ++++-
 src/com/drew/metadata/exif/GpsDescriptor.java      |    3 +-
 src/com/drew/metadata/exif/GpsDirectory.java       |    3 +-
 .../exif/PanasonicRawDistortionDescriptor.java     |  159 ++
 .../exif/PanasonicRawDistortionDirectory.java      |   86 +
 ...riptor.java => PanasonicRawIFD0Descriptor.java} |   29 +-
 .../metadata/exif/PanasonicRawIFD0Directory.java   |  153 ++
 ...tor.java => PanasonicRawWbInfo2Descriptor.java} |   32 +-
 .../exif/PanasonicRawWbInfo2Directory.java         |  103 +
 ...ptor.java => PanasonicRawWbInfoDescriptor.java} |   32 +-
 .../metadata/exif/PanasonicRawWbInfoDirectory.java |  102 +
 ...rnoteDescriptor.java => PrintIMDescriptor.java} |   29 +-
 ...xifIFD0Directory.java => PrintIMDirectory.java} |   34 +-
 ...scriptor.java => AppleMakernoteDescriptor.java} |   22 +-
 ...Directory.java => AppleMakernoteDirectory.java} |   25 +-
 .../exif/makernotes/CanonMakernoteDescriptor.java  |  445 +++-
 .../exif/makernotes/CanonMakernoteDirectory.java   |  106 +-
 .../makernotes/CasioType1MakernoteDescriptor.java  |    3 +-
 .../makernotes/CasioType1MakernoteDirectory.java   |    3 +-
 .../makernotes/CasioType2MakernoteDescriptor.java  |   12 +-
 .../makernotes/CasioType2MakernoteDirectory.java   |    3 +-
 .../makernotes/FujifilmMakernoteDescriptor.java    |    3 +-
 .../makernotes/FujifilmMakernoteDirectory.java     |    3 +-
 .../exif/makernotes/KodakMakernoteDescriptor.java  |    3 +-
 .../exif/makernotes/KodakMakernoteDirectory.java   |    3 +-
 .../makernotes/KyoceraMakernoteDescriptor.java     |   11 +-
 .../exif/makernotes/KyoceraMakernoteDirectory.java |    3 +-
 .../exif/makernotes/LeicaMakernoteDescriptor.java  |    3 +-
 .../exif/makernotes/LeicaMakernoteDirectory.java   |    3 +-
 .../makernotes/LeicaType5MakernoteDescriptor.java  |   79 +
 ...tory.java => LeicaType5MakernoteDirectory.java} |   39 +-
 .../makernotes/NikonType1MakernoteDescriptor.java  |    3 +-
 .../makernotes/NikonType1MakernoteDirectory.java   |    3 +-
 .../makernotes/NikonType2MakernoteDescriptor.java  |    3 +-
 .../makernotes/NikonType2MakernoteDirectory.java   |    7 +-
 .../OlympusCameraSettingsMakernoteDescriptor.java  |   77 +-
 .../OlympusCameraSettingsMakernoteDirectory.java   |    3 +
 .../OlympusEquipmentMakernoteDescriptor.java       |   64 +-
 .../OlympusEquipmentMakernoteDirectory.java        |    1 +
 .../OlympusFocusInfoMakernoteDescriptor.java       |  217 ++
 .../OlympusFocusInfoMakernoteDirectory.java        |  110 +
 .../OlympusImageProcessingMakernoteDescriptor.java |  240 +++
 .../OlympusImageProcessingMakernoteDirectory.java  |  212 ++
 .../makernotes/OlympusMakernoteDescriptor.java     |  242 ++-
 .../exif/makernotes/OlympusMakernoteDirectory.java |  439 +++-
 .../OlympusRawDevelopment2MakernoteDescriptor.java |  230 ++
 .../OlympusRawDevelopment2MakernoteDirectory.java  |  111 +
 .../OlympusRawDevelopmentMakernoteDescriptor.java  |  155 ++
 .../OlympusRawDevelopmentMakernoteDirectory.java   |   91 +
 .../OlympusRawInfoMakernoteDescriptor.java         |  141 ++
 .../OlympusRawInfoMakernoteDirectory.java          |  142 ++
 .../makernotes/PanasonicMakernoteDescriptor.java   |  305 ++-
 .../makernotes/PanasonicMakernoteDirectory.java    |  123 +-
 .../exif/makernotes/PentaxMakernoteDescriptor.java |    3 +-
 .../exif/makernotes/PentaxMakernoteDirectory.java  |    3 +-
 .../ReconyxHyperFireMakernoteDescriptor.java       |  105 +
 .../ReconyxHyperFireMakernoteDirectory.java        |  105 +
 .../ReconyxUltraFireMakernoteDescriptor.java       |  110 +
 .../ReconyxUltraFireMakernoteDirectory.java        |  116 ++
 .../exif/makernotes/RicohMakernoteDescriptor.java  |   13 +-
 .../exif/makernotes/RicohMakernoteDirectory.java   |    3 +-
 .../SamsungType2MakernoteDescriptor.java           |  213 ++
 .../makernotes/SamsungType2MakernoteDirectory.java |   89 +
 .../exif/makernotes/SanyoMakernoteDescriptor.java  |    3 +-
 .../exif/makernotes/SanyoMakernoteDirectory.java   |    7 +-
 .../exif/makernotes/SigmaMakernoteDescriptor.java  |    3 +-
 .../exif/makernotes/SigmaMakernoteDirectory.java   |    3 +-
 .../makernotes/SonyType1MakernoteDescriptor.java   |   33 +-
 .../makernotes/SonyType1MakernoteDirectory.java    |    5 +-
 .../makernotes/SonyType6MakernoteDescriptor.java   |    3 +-
 .../makernotes/SonyType6MakernoteDirectory.java    |    3 +-
 .../metadata/exif/makernotes/package-info.java     |    5 +
 src/com/drew/metadata/exif/makernotes/package.html |   33 -
 src/com/drew/metadata/exif/package-info.java       |    4 +
 src/com/drew/metadata/exif/package.html            |   33 -
 .../drew/metadata/file/FileMetadataDescriptor.java |    3 +-
 .../drew/metadata/file/FileMetadataDirectory.java  |    3 +-
 src/com/drew/metadata/file/FileMetadataReader.java |    2 +-
 src/com/drew/metadata/file/package-info.java       |    6 +
 src/com/drew/metadata/file/package.html            |   34 -
 src/com/drew/metadata/iptc/IptcDescriptor.java     |    3 +-
 src/com/drew/metadata/iptc/IptcDirectory.java      |    3 +-
 src/com/drew/metadata/iptc/IptcReader.java         |   60 +-
 src/com/drew/metadata/iptc/Iso2022Converter.java   |   15 +-
 src/com/drew/metadata/iptc/package-info.java       |    4 +
 src/com/drew/metadata/iptc/package.html            |   33 -
 .../HuffmanTablesDescriptor.java}                  |   35 +-
 .../drew/metadata/jpeg/HuffmanTablesDirectory.java |  360 ++++
 .../drew/metadata/jpeg/JpegCommentDescriptor.java  |    3 +-
 .../drew/metadata/jpeg/JpegCommentDirectory.java   |    3 +-
 src/com/drew/metadata/jpeg/JpegCommentReader.java  |    5 +-
 src/com/drew/metadata/jpeg/JpegComponent.java      |   13 +-
 src/com/drew/metadata/jpeg/JpegDescriptor.java     |    7 +-
 src/com/drew/metadata/jpeg/JpegDhtReader.java      |  101 +
 src/com/drew/metadata/jpeg/JpegDirectory.java      |    3 +-
 src/com/drew/metadata/jpeg/JpegDnlReader.java      |   77 +
 src/com/drew/metadata/jpeg/JpegReader.java         |    4 +-
 src/com/drew/metadata/jpeg/package-info.java       |    4 +
 src/com/drew/metadata/jpeg/package.html            |   33 -
 src/com/drew/metadata/package-info.java            |    6 +
 src/com/drew/metadata/package.html                 |   33 -
 .../drew/metadata/tiff/DirectoryTiffHandler.java   |   54 +-
 src/com/drew/metadata/tiff/package-info.java       |    6 +
 src/com/drew/metadata/tiff/package.html            |   34 -
 .../josm/actions/AbstractMergeAction.java          |    2 +-
 .../josm/actions/AbstractPasteAction.java          |   14 +-
 .../josm/actions/AlignInCircleAction.java          |   78 +-
 .../josm/actions/AlignInLineAction.java            |   17 +-
 .../josm/actions/CopyCoordinatesAction.java        |    3 +
 .../josm/actions/CreateCircleAction.java           |    4 +-
 .../josm/actions/CreateMultipolygonAction.java     |    9 +-
 .../josm/actions/DialogsToggleAction.java          |    2 +-
 .../josm/actions/DownloadPrimitiveAction.java      |    5 +-
 .../josm/actions/ExpertToggleAction.java           |    7 +-
 .../josm/actions/JoinAreasAction.java              |    2 +-
 .../josm/actions/MapRectifierWMSmenuAction.java    |    1 +
 .../josm/actions/OrthogonalizeAction.java          |   21 +-
 .../openstreetmap/josm/actions/PurgeAction.java    |    2 +-
 .../josm/actions/RenameLayerAction.java            |    3 +-
 .../josm/actions/ReverseWayAction.java             |    1 +
 .../openstreetmap/josm/actions/SaveActionBase.java |    6 +-
 .../openstreetmap/josm/actions/SplitWayAction.java |   11 +-
 .../ToggleUploadDiscouragedLayerAction.java        |    5 +-
 .../openstreetmap/josm/actions/UploadAction.java   |   41 +-
 .../josm/actions/mapmode/DrawAction.java           |    1 +
 .../josm/actions/mapmode/ExtrudeAction.java        |    6 +-
 .../josm/actions/mapmode/SelectAction.java         |   12 +-
 .../actions/relation/AddSelectionToRelations.java  |    2 +-
 .../actions/relation/DownloadMembersAction.java    |    2 +-
 .../DownloadSelectedIncompleteMembersAction.java   |    2 +-
 .../relation/SelectInRelationListAction.java       |    2 +-
 .../josm/actions/relation/SelectMembersAction.java |    2 +-
 .../josm/actions/search/SearchAction.java          |   14 +
 src/org/openstreetmap/josm/command/Command.java    |    2 +-
 .../josm/command/SplitWayCommand.java              |   18 +-
 .../conflict/WayNodesConflictResolverCommand.java  |    1 +
 .../josm/corrector/ReverseWayTagCorrector.java     |   11 +
 .../openstreetmap/josm/corrector/TagCorrector.java |   10 +-
 src/org/openstreetmap/josm/data/APIDataSet.java    |   44 +-
 src/org/openstreetmap/josm/data/Preferences.java   |   24 +-
 .../openstreetmap/josm/data/coor/Coordinate.java   |    6 +-
 .../openstreetmap/josm/data/coor/PolarCoor.java    |  107 +
 src/org/openstreetmap/josm/data/gpx/GpxData.java   |   62 +-
 .../josm/data/imagery/TMSCachedTileLoader.java     |    5 +
 .../josm/data/imagery/WMTSTileSource.java          |    3 +-
 src/org/openstreetmap/josm/data/osm/BBox.java      |   15 +-
 src/org/openstreetmap/josm/data/osm/DataSet.java   |   14 +
 .../josm/data/osm/DefaultNameFormatter.java        |    6 +-
 .../openstreetmap/josm/data/osm/FilterModel.java   |    6 +-
 .../openstreetmap/josm/data/osm/IPrimitive.java    |    4 +-
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |    1 +
 src/org/openstreetmap/josm/data/osm/User.java      |   10 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |    1 +
 .../visitor/paint/relations/MultipolygonCache.java |   16 +-
 .../data/projection/proj/TransverseMercator.java   |   21 +
 .../josm/data/tagging/ac/AutoCompletionItem.java   |    6 +-
 .../josm/data/tagging/ac/AutoCompletionSet.java    |   51 +-
 .../data/validation/tests/OpeningHourTest.java     |   71 +-
 .../data/validation/tests/OverlappingWays.java     |    4 +-
 .../josm/data/validation/tests/UnclosedWays.java   |    2 +-
 src/org/openstreetmap/josm/gui/ExtendedDialog.java |    2 +-
 src/org/openstreetmap/josm/gui/MainMenu.java       |   12 +-
 src/org/openstreetmap/josm/gui/MapStatus.java      |   97 +-
 src/org/openstreetmap/josm/gui/MapView.java        |   13 +-
 .../josm/gui/bbox/TileSelectionBBoxChooser.java    |    2 +-
 .../josm/gui/bugreport/JosmUpdatePanel.java        |    5 +-
 .../josm/gui/conflict/pair/AbstractListMerger.java |   28 +-
 .../conflict/pair/properties/PropertiesMerger.java |   12 +-
 .../josm/gui/conflict/pair/tags/TagMerger.java     |   14 +-
 .../josm/gui/dialogs/FilterDialog.java             |    6 +-
 .../josm/gui/dialogs/InspectPrimitiveDataText.java |   11 +-
 .../josm/gui/dialogs/LayerListPopup.java           |    3 +-
 .../josm/gui/dialogs/MenuItemSearchDialog.java     |   11 +-
 .../josm/gui/dialogs/SelectionListDialog.java      |   23 +-
 .../josm/gui/dialogs/ValidatorDialog.java          |   24 +-
 .../dialogs/changeset/ChangesetContentPanel.java   |    2 +-
 .../josm/gui/dialogs/layer/DuplicateAction.java    |    2 +-
 .../gui/dialogs/layer/ShowHideLayerAction.java     |    2 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |    4 +-
 .../josm/gui/dialogs/properties/TagEditHelper.java |   12 +-
 .../gui/dialogs/relation/ChildRelationBrowser.java |    7 +-
 .../actions/AddSelectedAfterSelection.java         |    2 +-
 .../relation/actions/AddSelectedAtEndAction.java   |    2 +-
 .../relation/actions/AddSelectedAtStartAction.java |    2 +-
 .../actions/AddSelectedBeforeSelection.java        |    2 +-
 .../gui/dialogs/relation/actions/ApplyAction.java  |    2 +-
 .../actions/DeleteCurrentRelationAction.java       |    2 +-
 .../actions/DownloadIncompleteMembersAction.java   |    2 +-
 .../DownloadSelectedIncompleteMembersAction.java   |    2 +-
 .../relation/actions/DuplicateRelationAction.java  |    2 +-
 .../gui/dialogs/relation/actions/EditAction.java   |    2 +-
 .../dialogs/relation/actions/MoveDownAction.java   |    2 +-
 .../gui/dialogs/relation/actions/MoveUpAction.java |    2 +-
 .../dialogs/relation/actions/RefreshAction.java    |    2 +-
 .../gui/dialogs/relation/actions/RemoveAction.java |    2 +-
 .../relation/actions/RemoveSelectedAction.java     |    2 +-
 .../dialogs/relation/actions/ReverseAction.java    |    2 +-
 .../SelectPrimitivesForSelectedMembersAction.java  |    2 +-
 .../actions/SelectedMembersForSelectionAction.java |    2 +-
 .../gui/dialogs/relation/actions/SortAction.java   |    2 +-
 .../dialogs/relation/actions/SortBelowAction.java  |    2 +-
 .../josm/gui/download/BookmarkSelection.java       |    8 +-
 .../josm/gui/download/OverpassDownloadSource.java  |    8 +-
 .../josm/gui/download/PlaceSelection.java          |    2 +-
 .../openstreetmap/josm/gui/help/HelpBrowser.java   |   12 +-
 .../josm/gui/history/NodeListViewer.java           |    4 +-
 .../josm/gui/history/VersionInfoPanel.java         |    4 +-
 .../josm/gui/history/VersionTable.java             |    4 +-
 .../gui/io/AsynchronousUploadPrimitivesTask.java   |  153 ++
 .../josm/gui/io/ChangesetCommentModel.java         |   12 +
 .../josm/gui/io/ChangesetManagementPanel.java      |    4 +-
 .../josm/gui/io/CloseChangesetDialog.java          |    4 +-
 .../josm/gui/io/LayerNameAndFilePathTableCell.java |    6 +-
 .../josm/gui/io/SaveLayersDialog.java              |   10 +-
 .../josm/gui/io/TagSettingsPanel.java              |   18 +-
 .../openstreetmap/josm/gui/io/UploadDialog.java    |   23 +-
 .../josm/gui/io/UploadSelectionDialog.java         |   10 +-
 .../josm/gui/io/importexport/NoteImporter.java     |    6 +-
 .../josm/gui/layer/AbstractMapViewPaintable.java   |    3 +-
 .../josm/gui/layer/AbstractTileSourceLayer.java    |    2 +-
 .../openstreetmap/josm/gui/layer/AutosaveTask.java |  125 +-
 .../josm/gui/layer/CustomizeColor.java             |    3 +-
 src/org/openstreetmap/josm/gui/layer/Layer.java    |    6 +-
 .../josm/gui/layer/MainLayerManager.java           |   86 +-
 .../openstreetmap/josm/gui/layer/NoteLayer.java    |  261 ++-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |   39 +-
 .../gui/layer/geoimage/CorrelateGpxWithImages.java |   16 +-
 .../josm/gui/layer/geoimage/ImageDisplay.java      |  509 +++--
 .../josm/gui/layer/geoimage/ImageEntry.java        |    1 +
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |   23 +-
 .../gui/layer/geoimage/ShowThumbnailAction.java    |    3 +-
 .../josm/gui/layer/geoimage/ThumbsLoader.java      |    3 +-
 .../gui/layer/gpx/ChooseTrackVisibilityAction.java |    3 +-
 .../gui/layer/gpx/ConvertToDataLayerAction.java    |    3 +-
 .../josm/gui/layer/gpx/CustomizeDrawingAction.java |    3 +-
 .../gui/layer/gpx/DownloadWmsAlongTrackAction.java |    3 +-
 .../josm/gui/layer/gpx/ImportAudioAction.java      |    3 +-
 .../josm/gui/layer/gpx/ImportImagesAction.java     |    3 +-
 .../layer/gpx/MarkersFromNamedPointsAction.java    |    3 +-
 .../josm/gui/layer/markerlayer/MarkerLayer.java    |    9 +-
 .../josm/gui/mappaint/ElemStyles.java              |   16 +-
 .../gui/mappaint/mapcss/ExpressionFactory.java     |   12 +
 .../josm/gui/oauth/OAuthAuthorizationWizard.java   |   14 +-
 .../josm/gui/preferences/PreferenceTabbedPane.java |    9 +-
 .../josm/gui/preferences/SourceEditor.java         |    2 +-
 .../advanced/AbstractTableListEditor.java          |    4 +-
 .../gui/preferences/display/LafPreference.java     |    7 +
 .../gui/preferences/imagery/ImageryPreference.java |   16 +-
 .../gui/preferences/plugin/PluginListPanel.java    |    8 +-
 .../plugin/PluginUpdatePolicyPanel.java            |   20 +-
 .../projection/UTMProjectionChoice.java            |    9 +-
 .../preferences/server/OsmApiUrlInputPanel.java    |    2 +-
 .../preferences/server/ProxyPreferencesPanel.java  |   18 +-
 .../gui/tagging/ac/AutoCompletingComboBox.java     |    4 +-
 .../gui/tagging/ac/AutoCompletingTextField.java    |   10 +-
 .../gui/tagging/ac/AutoCompletionListItem.java     |    2 +-
 .../josm/gui/tagging/ac/AutoCompletionManager.java |    2 +-
 .../josm/gui/tagging/presets/TaggingPreset.java    |    3 +-
 .../gui/tagging/presets/TaggingPresetReader.java   |   16 +-
 .../tagging/presets/TaggingPresetSearchDialog.java |    2 +-
 .../TaggingPresetSearchPrimitiveDialog.java        |    2 +-
 .../openstreetmap/josm/gui/widgets/HtmlPanel.java  |   22 +
 .../josm/gui/widgets/JMultilineLabel.java          |   17 +-
 .../josm/gui/widgets/PopupMenuButton.java          |   23 +-
 src/org/openstreetmap/josm/io/Capabilities.java    |    2 +-
 src/org/openstreetmap/josm/io/UploadStrategy.java  |   24 +-
 .../openstreetmap/josm/io/imagery/WMSImagery.java  |    4 +-
 .../remotecontrol/handler/LoadAndZoomHandler.java  |   18 +-
 src/org/openstreetmap/josm/tools/HttpClient.java   |    4 +
 .../openstreetmap/josm/tools/ImageProvider.java    |   55 +-
 .../tools/JosmDecimalFormatSymbolsProvider.java    |   12 +-
 .../josm/tools/template_engine/Condition.java      |    9 +
 styles/standard/elemstyles.mapcss                  |   82 +-
 .../josm/data/imagery/ImageryCompareTestIT.java    |    2 +-
 .../openstreetmap/josm/data/osm/TaginfoTestIT.java |    2 +-
 test/unit/org/openstreetmap/josm/TestUtils.java    |   30 +
 .../josm/actions/AlignInLineActionTest.java        |   86 +-
 .../josm/actions/CombineWayActionTest.java         |    1 +
 .../josm/actions/ExtensionFileFilterTest.java      |    1 +
 .../openstreetmap/josm/command/AddCommandTest.java |    2 +
 .../josm/command/AddPrimitivesCommandTest.java     |    2 +
 .../josm/command/ChangeCommandTest.java            |    2 +
 .../josm/command/ChangeNodesCommandTest.java       |    2 +
 .../josm/command/ChangePropertyCommandTest.java    |    2 +
 .../josm/command/ChangePropertyKeyCommandTest.java |    2 +
 .../ChangeRelationMemberRoleCommandTest.java       |    2 +
 .../openstreetmap/josm/command/CommandTest.java    |    2 +
 .../josm/command/DeleteCommandTest.java            |    2 +
 .../josm/command/MoveCommandTest.java              |    2 +
 .../josm/command/PurgeCommandTest.java             |    2 +
 .../josm/command/RemoveNodesCommandTest.java       |    2 +
 .../josm/command/RotateCommandTest.java            |    2 +
 .../josm/command/ScaleCommandTest.java             |    2 +
 .../josm/command/SelectCommandTest.java            |    2 +
 .../josm/command/SequenceCommandTest.java          |    2 +
 .../josm/command/TransformNodesCommandTest.java    |    2 +
 .../command/conflict/ConflictAddCommandTest.java   |    2 +
 .../conflict/ConflictResolveCommandTest.java       |    2 +
 .../CoordinateConflictResolveCommandTest.java      |    2 +
 .../DeletedStateConflictResolveCommandTest.java    |    2 +
 .../ModifiedConflictResolveCommandTest.java        |    2 +
 .../RelationMemberConflictResolverCommandTest.java |    2 +
 .../conflict/TagConflictResolveCommandTest.java    |    2 +
 .../VersionConflictResolveCommandTest.java         |    2 +
 .../WayNodesConflictResolverCommandTest.java       |    2 +
 .../josm/data/coor/CachedLatLonTest.java           |    2 +
 .../openstreetmap/josm/data/coor/LatLonTest.java   |    2 +
 .../josm/data/coor/PolarCoorTest.java              |   67 +
 .../josm/data/correction/TagCorrectionTest.java    |    2 +
 .../openstreetmap/josm/data/gpx/GpxDataTest.java   |    2 +
 .../openstreetmap/josm/data/gpx/GpxRouteTest.java  |    2 +
 .../data/gpx/ImmutableGpxTrackSegmentTest.java     |    2 +
 .../josm/data/gpx/ImmutableGpxTrackTest.java       |    2 +
 .../openstreetmap/josm/data/gpx/WayPointTest.java  |    2 +
 .../josm/data/gpx/WithAttributesTest.java          |    2 +
 .../openstreetmap/josm/data/notes/NoteTest.java    |    2 +
 .../josm/data/oauth/OAuthParametersTest.java       |    2 +
 .../josm/data/oauth/OAuthTokenTest.java            |    2 +
 .../org/openstreetmap/josm/data/osm/BBoxTest.java  |    2 +
 .../openstreetmap/josm/data/osm/FilterTest.java    |    2 +
 .../openstreetmap/josm/data/osm/StorageTest.java   |    2 +
 .../tagging/ac/AutoCompletionPriorityTest.java     |    2 +
 .../data/validation/tests/OpeningHourTestTest.java |   46 +-
 .../org/openstreetmap/josm/gui/MapStatusTest.java  |    2 +
 .../gui/dialogs/InspectPrimitiveDialogTest.java    |    3 +-
 .../josm/gui/dialogs/MinimapDialogTest.java        |  193 +-
 .../io/AsynchronousUploadPrimitivesTaskTest.java   |   74 +
 .../josm/gui/io/ChangesetCommentModelTest.java     |   47 +
 .../josm/gui/layer/AutosaveTaskTest.java           |    2 +-
 .../josm/gui/layer/NoteLayerTest.java              |   62 +-
 .../josm/gui/layer/geoimage/ImageDisplayTest.java  |   13 +-
 .../layer/gpx/DownloadWmsAlongTrackActionTest.java |    2 +-
 .../gui/preferences/advanced/PrefEntryTest.java    |    2 +
 .../gui/tagging/ac/AutoCompletionManagerTest.java  |    2 +
 .../josm/gui/util/WindowGeometryTest.java          |    2 +
 .../josm/plugins/PluginHandlerTest.java            |    2 +
 .../josm/spi/preferences/ListListSettingTest.java  |    2 +
 .../josm/spi/preferences/ListSettingTest.java      |    2 +
 .../josm/spi/preferences/MapListSettingTest.java   |    2 +
 .../josm/spi/preferences/StringSettingTest.java    |    2 +
 .../josm/testutils/JOSMTestRules.java              |   54 +
 .../josm/testutils/TileSourceRule.java             |  313 +++
 .../JosmDecimalFormatSymbolsProviderTest.java      |   43 +
 .../org/openstreetmap/josm/tools/MultiMapTest.java |    5 +-
 .../org/openstreetmap/josm/tools/PairTest.java     |    2 +
 509 files changed, 32764 insertions(+), 17337 deletions(-)

diff --cc debian/changelog
index 00ece17,d26d496..51c772b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,24 @@@
+ josm (0.0.svn13170+dfsg-2) unstable; urgency=medium
+ 
+   * Bump minimum required jmapviewer version to 2.4.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 27 Nov 2017 08:29:53 +0100
+ 
+ josm (0.0.svn13170+dfsg-1) unstable; urgency=medium
+ 
+   * New tested snapshot.
+   * Update copyright holders for metadata-extractor sources.
+   * Drop 'Update multipolygon' patch, included upstream.
+     Refresh remaining patches.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 26 Nov 2017 17:45:24 +0100
+ 
 +josm (0.0.svn13053+dfsg-2~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 07 Nov 2017 07:26:01 +0100
 +
  josm (0.0.svn13053+dfsg-2) unstable; urgency=medium
  
    * Add patch to fix 'Update multipolygon' action.

-- 
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