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

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

commit 02aa4c8dde2372f3e3f52d9693afebfafd20af52
Merge: 1576076 d632523
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sun Aug 6 10:34:24 2017 +0200

    Merge tag 'debian/0.0.svn12542+dfsg-1' into stretch-backports

 .classpath                                         |     4 +-
 REVISION                                           |    10 +-
 build.xml                                          |    21 +-
 data/boundaries.osm                                | 11264 ++++++++++++++++++-
 data/defaultpresets.xml                            |    13 +-
 data/validator/combinations.mapcss                 |     2 +-
 data/validator/ignoretags.cfg                      |     2 +
 data/validator/numeric.mapcss                      |    26 +-
 debian/changelog                                   |    10 +
 debian/control                                     |     4 +-
 debian/copyright                                   |     4 -
 debian/josm.dirs                                   |     4 +-
 debian/patches/00-build.patch                      |    23 +-
 debian/patches/06-move_data_out_of_jar.patch       |     4 +-
 debian/patches/08-use_noto_font.patch              |     6 +-
 debian/patches/series                              |     1 +
 ...2543_follow-AppStream-metadata-guidelines.patch |   117 +
 debian/rules                                       |     2 +-
 eclipse/JOSM (Java 8).launch                       |     2 +-
 i18n/po/af.po                                      |   233 +-
 i18n/po/am.po                                      |   233 +-
 i18n/po/ar.po                                      |   233 +-
 i18n/po/ast.po                                     |   249 +-
 i18n/po/az.po                                      |   233 +-
 i18n/po/be.po                                      |   253 +-
 i18n/po/bg.po                                      |   247 +-
 i18n/po/bn.po                                      |   233 +-
 i18n/po/br.po                                      |   233 +-
 i18n/po/bs.po                                      |   233 +-
 i18n/po/ca.po                                      |   237 +-
 i18n/po/c...@valencia.po                             |   233 +-
 i18n/po/cs.po                                      |   278 +-
 i18n/po/cy.po                                      |   233 +-
 i18n/po/da.po                                      |   393 +-
 i18n/po/de.po                                      |   364 +-
 i18n/po/de_DE.po                                   |   233 +-
 i18n/po/el.po                                      |   233 +-
 i18n/po/en_AU.po                                   |   233 +-
 i18n/po/en_CA.po                                   |   233 +-
 i18n/po/en_GB.po                                   |   241 +-
 i18n/po/eo.po                                      |   233 +-
 i18n/po/es.po                                      |   270 +-
 i18n/po/et.po                                      |   233 +-
 i18n/po/eu.po                                      |   233 +-
 i18n/po/fa.po                                      |   233 +-
 i18n/po/fi.po                                      |   233 +-
 i18n/po/fil.po                                     |   233 +-
 i18n/po/fo.po                                      |   233 +-
 i18n/po/fr.po                                      |   291 +-
 i18n/po/ga.po                                      |   233 +-
 i18n/po/gl.po                                      |   233 +-
 i18n/po/he.po                                      |   233 +-
 i18n/po/hi.po                                      |   233 +-
 i18n/po/hr.po                                      |   233 +-
 i18n/po/ht.po                                      |   233 +-
 i18n/po/hu.po                                      |  3105 ++---
 i18n/po/hy.po                                      |   233 +-
 i18n/po/ia.po                                      |   233 +-
 i18n/po/id.po                                      |   233 +-
 i18n/po/is.po                                      |   233 +-
 i18n/po/it.po                                      |   247 +-
 i18n/po/ja.po                                      |   237 +-
 i18n/po/ka.po                                      |   233 +-
 i18n/po/km.po                                      |   233 +-
 i18n/po/ko.po                                      |   233 +-
 i18n/po/ku.po                                      |   233 +-
 i18n/po/ky.po                                      |   233 +-
 i18n/po/lb.po                                      |   233 +-
 i18n/po/lo.po                                      |   233 +-
 i18n/po/lt.po                                      |   800 +-
 i18n/po/lv.po                                      |   233 +-
 i18n/po/mk.po                                      |   233 +-
 i18n/po/mr.po                                      |   233 +-
 i18n/po/ms.po                                      |   233 +-
 i18n/po/nb.po                                      |   264 +-
 i18n/po/nds.po                                     |   233 +-
 i18n/po/nl.po                                      |   253 +-
 i18n/po/nn.po                                      |   233 +-
 i18n/po/oc.po                                      |   233 +-
 i18n/po/pa.po                                      |   233 +-
 i18n/po/pl.po                                      |   392 +-
 i18n/po/pt.po                                      |   241 +-
 i18n/po/pt_BR.po                                   |   243 +-
 i18n/po/rm.po                                      |   233 +-
 i18n/po/ro.po                                      |   233 +-
 i18n/po/ru.po                                      |   296 +-
 i18n/po/sk.po                                      |   251 +-
 i18n/po/sl.po                                      |   233 +-
 i18n/po/sq.po                                      |   233 +-
 i18n/po/sr.po                                      |   233 +-
 i18n/po/sv.po                                      |   233 +-
 i18n/po/ta.po                                      |   233 +-
 i18n/po/te.po                                      |   233 +-
 i18n/po/th.po                                      |   233 +-
 i18n/po/tr.po                                      |   233 +-
 i18n/po/ug.po                                      |   233 +-
 i18n/po/uk.po                                      |   253 +-
 i18n/po/ur.po                                      |   233 +-
 i18n/po/vi.po                                      |   237 +-
 i18n/po/wae.po                                     |   233 +-
 i18n/po/zh_CN.po                                   |   233 +-
 i18n/po/zh_TW.po                                   |   249 +-
 netbeans/nbproject/project.properties              |     6 +-
 src/org/openstreetmap/josm/Main.java               |     6 +-
 .../josm/actions/AddImageryLayerAction.java        |    11 +-
 .../josm/actions/AlignInLineAction.java            |     1 +
 .../josm/actions/CombineWayAction.java             |   363 +-
 .../openstreetmap/josm/actions/DeleteAction.java   |     2 +-
 .../josm/actions/MapRectifierWMSmenuAction.java    |    16 +-
 .../josm/actions/OrthogonalizeAction.java          |     4 +-
 .../josm/actions/PasteTagsAction.java              |     4 +-
 .../josm/actions/ReverseWayAction.java             |     6 +-
 .../josm/actions/SessionLoadAction.java            |    18 +-
 .../josm/actions/SimplifyWayAction.java            |     1 +
 .../openstreetmap/josm/actions/UnGlueAction.java   |     1 -
 .../openstreetmap/josm/actions/UploadAction.java   |    34 +-
 .../josm/actions/mapmode/DeleteAction.java         |    32 +-
 .../josm/actions/mapmode/DrawAction.java           |    12 +-
 .../josm/actions/mapmode/ExtrudeAction.java        |    22 +-
 .../actions/mapmode/ImproveWayAccuracyAction.java  |    12 +-
 .../josm/actions/mapmode/MapMode.java              |    68 +-
 .../josm/actions/mapmode/ParallelWayAction.java    |    18 +-
 .../josm/actions/mapmode/ParallelWays.java         |     4 +-
 .../josm/actions/mapmode/SelectAction.java         |    16 +-
 .../josm/actions/search/PushbackTokenizer.java     |     6 +-
 .../josm/actions/search/SearchAction.java          |   176 +-
 .../josm/actions/search/SearchCompiler.java        |    70 +-
 .../josm/corrector/ReverseWayNoTagCorrector.java   |     4 +-
 .../josm/corrector/ReverseWayTagCorrector.java     |    10 +-
 src/org/openstreetmap/josm/data/Preferences.java   |    16 +-
 .../josm/data/cache/ICachedLoaderJob.java          |     2 +
 .../josm/data/cache/JCSCacheManager.java           |     6 +-
 .../josm/data/conflict/IConflictListener.java      |    12 +
 src/org/openstreetmap/josm/data/coor/LatLon.java   |    18 +-
 src/org/openstreetmap/josm/data/imagery/Shape.java |     4 +-
 .../josm/data/imagery/TMSCachedTileLoader.java     |     3 +-
 .../josm/data/imagery/TemplatedWMSTileSource.java  |    16 +-
 src/org/openstreetmap/josm/data/notes/Note.java    |    30 +-
 .../openstreetmap/josm/data/notes/NoteComment.java |    25 +-
 .../josm/data/osm/AbstractPrimitive.java           |    26 +
 src/org/openstreetmap/josm/data/osm/Changeset.java |    21 +-
 .../josm/data/osm/ChangesetCache.java              |     4 +-
 src/org/openstreetmap/josm/data/osm/DataSet.java   |     3 +-
 src/org/openstreetmap/josm/data/osm/NodeGraph.java |   307 +
 src/org/openstreetmap/josm/data/osm/NodePair.java  |   109 +
 src/org/openstreetmap/josm/data/osm/NoteData.java  |     5 +-
 .../openstreetmap/josm/data/osm/QuadBuckets.java   |     4 +-
 src/org/openstreetmap/josm/data/osm/User.java      |     4 +-
 .../josm/data/osm/event/DatasetEventManager.java   |     4 +-
 .../josm/data/osm/event/SelectionEventManager.java |     4 +-
 .../data/osm/visitor/paint/OffsetIterator.java     |    21 +-
 .../josm/data/osm/visitor/paint/PaintColors.java   |     4 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |    37 +-
 .../data/preferences/ParametrizedEnumProperty.java |     5 +
 .../data/projection/ProjectionChangeListener.java  |     3 +
 .../ProjectionConfigurationException.java          |     7 +
 .../josm/data/projection/datum/AbstractDatum.java  |     5 +
 .../data/validation/routines/DomainValidator.java  |     3 +-
 .../josm/data/validation/tests/InternetTags.java   |     4 +-
 .../josm/data/validation/tests/Lanes.java          |     1 +
 src/org/openstreetmap/josm/gui/MapFrame.java       |     5 +-
 src/org/openstreetmap/josm/gui/MapSlider.java      |     6 +-
 src/org/openstreetmap/josm/gui/MapViewState.java   |     8 +
 src/org/openstreetmap/josm/gui/NoteSortDialog.java |     5 +-
 .../josm/gui/autofilter/AutoFilter.java            |     5 +
 .../josm/gui/autofilter/AutoFilterButton.java      |     2 +-
 .../josm/gui/autofilter/AutoFilterManager.java     |    36 +-
 .../josm/gui/bbox/SlippyMapControler.java          |     4 +-
 .../gui/datatransfer/importers/TextTagPaster.java  |     4 +-
 .../josm/gui/dialogs/ConflictDialog.java           |    93 +-
 .../josm/gui/dialogs/RelationListDialog.java       |     4 +-
 .../dialogs/changeset/ChangesetCacheManager.java   |    28 +-
 .../changeset/ChangesetCacheManagerModel.java      |     2 +-
 .../changeset/ChangesetCacheTableCellRenderer.java |     4 +-
 .../dialogs/changeset/ChangesetDetailPanel.java    |     3 +-
 .../changeset/ChangesetListCellRenderer.java       |     4 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |     2 +-
 .../josm/gui/dialogs/properties/TagEditHelper.java |     4 +-
 .../relation/MemberTableLinkedCellRenderer.java    |    32 +-
 .../gui/dialogs/relation/sort/RelationSorter.java  |    14 +-
 .../josm/gui/download/BookmarkList.java            |   197 +-
 .../josm/gui/download/BookmarkSelection.java       |    21 +
 .../josm/gui/download/DownloadDialog.java          |     2 +-
 .../openstreetmap/josm/gui/draw/MapViewPath.java   |    66 +-
 .../openstreetmap/josm/gui/help/HelpBrowser.java   |     6 +-
 .../josm/gui/history/VersionTableModel.java        |    23 +-
 .../josm/gui/io/AbstractUploadTask.java            |     5 +
 .../josm/gui/io/ChangesetCellRenderer.java         |     8 +-
 .../io/ConfigurationParameterRequestHandler.java   |    11 +
 .../josm/gui/io/CredentialDialog.java              |     6 +
 .../josm/gui/io/LayerNameAndFilePathTableCell.java |    12 +-
 .../josm/gui/io/SaveLayersDialog.java              |     6 +
 .../openstreetmap/josm/gui/io/SaveLayersModel.java |     3 +
 .../openstreetmap/josm/gui/io/SaveLayersTable.java |     3 +
 .../josm/gui/io/SaveLayersTableColumnModel.java    |    13 +-
 .../josm/gui/io/UploadAndSaveProgressRenderer.java |     3 +
 .../openstreetmap/josm/gui/io/UploadDialog.java    |    21 +-
 .../josm/gui/io/UploadParameterSummaryPanel.java   |     3 +-
 .../josm/gui/layer/AbstractTileSourceLayer.java    |     8 +-
 .../josm/gui/layer/CustomizeColor.java             |     6 +
 .../openstreetmap/josm/gui/layer/ImageryLayer.java |     5 +
 .../josm/gui/layer/JumpToMarkerActions.java        |    24 +
 .../josm/gui/layer/geoimage/ImageDisplay.java      |     5 +
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |     3 +
 .../josm/gui/layer/geoimage/ThumbsLoader.java      |     5 +
 .../gui/layer/imagery/SharpenImageProcessor.java   |     6 +-
 .../gui/mappaint/mapcss/ExpressionFactory.java     |    21 +-
 .../josm/gui/mappaint/mapcss/Selector.java         |    47 +-
 .../gui/mappaint/styleelement/BoxTextElement.java  |    24 +-
 .../gui/mappaint/styleelement/StyleElement.java    |    16 +-
 .../gui/mappaint/styleelement/TextElement.java     |    43 +-
 .../josm/gui/mappaint/styleelement/TextLabel.java  |   118 +-
 .../placement/CompletelyInsideAreaStrategy.java    |    56 +-
 .../styleelement/placement/OnLineStrategy.java     |    43 +-
 .../placement/PartiallyInsideAreaStrategy.java     |    20 +-
 .../placement/PositionForAreaStrategy.java         |     9 +
 .../gui/preferences/DefaultPreferenceSetting.java  |    16 +
 .../preferences/DefaultTabPreferenceSetting.java   |     5 +
 .../josm/gui/preferences/PreferenceDialog.java     |     7 +
 .../josm/gui/preferences/PreferenceTabbedPane.java |    54 +-
 .../josm/gui/preferences/SourceProvider.java       |     9 +
 .../gui/preferences/imagery/AddImageryDialog.java  |     4 +-
 .../gui/preferences/imagery/AddImageryPanel.java   |     1 +
 .../projection/LambertProjectionChoice.java        |     4 +-
 .../projection/ProjectionPreference.java           |    30 +-
 .../projection/UTMFranceDOMProjectionChoice.java   |    40 +-
 .../josm/gui/preferences/shortcut/PrefJPanel.java  |    11 +-
 .../openstreetmap/josm/gui/tagging/TagTable.java   |     2 +-
 .../josm/gui/util/AdvancedKeyPressDetector.java    |    40 +
 .../josm/gui/util/FileFilterAllFiles.java          |     8 +-
 .../josm/gui/util/ModifierExListener.java          |    15 +
 .../josm/gui/util/ModifierListener.java            |     2 +
 src/org/openstreetmap/josm/io/ChangesetQuery.java  |    26 +
 .../josm/io/DefaultProxySelector.java              |     8 +-
 .../openstreetmap/josm/io/DiffResultProcessor.java |     9 +
 src/org/openstreetmap/josm/io/FileExporter.java    |    18 +
 src/org/openstreetmap/josm/io/GeoJSONWriter.java   |     4 +-
 .../josm/io/MissingOAuthAccessTokenException.java  |     9 +-
 .../openstreetmap/josm/io/OsmChangeImporter.java   |     4 +
 .../openstreetmap/josm/io/OsmChangesetParser.java  |     2 +-
 src/org/openstreetmap/josm/io/OsmConnection.java   |     2 +-
 src/org/openstreetmap/josm/io/OsmImporter.java     |     4 +
 .../josm/io/OsmServerReadPostprocessor.java        |    11 +-
 src/org/openstreetmap/josm/io/OsmServerReader.java |    63 +
 .../josm/io/OsmServerUserInfoReader.java           |    28 +-
 .../josm/io/OsmServerUserPreferencesReader.java    |    94 +
 .../josm/io/OsmServerWritePostprocessor.java       |     5 +
 .../josm/io/StreamProgressUpdater.java             |     4 +
 src/org/openstreetmap/josm/io/XmlWriter.java       |    20 +-
 .../josm/io/audio/JavaFxMediaPlayer.java           |    12 +-
 .../openstreetmap/josm/io/imagery/WMSImagery.java  |    36 +-
 .../josm/io/remotecontrol/AddTagsDialog.java       |     2 +-
 .../josm/io/remotecontrol/DNSNameFix.java          |   105 -
 .../io/remotecontrol/RemoteControlHttpsServer.java |    23 +-
 .../remotecontrol/handler/LoadAndZoomHandler.java  |    10 +-
 .../remotecontrol/handler/LoadObjectHandler.java   |    10 +-
 .../josm/io/session/SessionReader.java             |   186 +-
 .../josm/io/session/SessionWriter.java             |    60 +-
 src/org/openstreetmap/josm/tools/ColorScale.java   |     8 +-
 src/org/openstreetmap/josm/tools/I18n.java         |     4 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |     6 +-
 .../openstreetmap/josm/tools/InputMapUtils.java    |     8 +-
 .../josm/tools/MultikeyActionsHandler.java         |     3 +-
 .../openstreetmap/josm/tools/PlatformHookOsx.java  |     4 +-
 src/org/openstreetmap/josm/tools/Shortcut.java     |    15 +-
 src/org/openstreetmap/josm/tools/Territories.java  |     5 +-
 test/data/renderer/area-text/reference.png         |   Bin 4820 -> 4889 bytes
 test/data/renderer/area-text/style.mapcss          |     9 +
 test/data/renderer/way-dashes-clamp/data.osm       |   165 +
 test/data/renderer/way-dashes-clamp/reference.png  |   Bin 0 -> 6015 bytes
 test/data/renderer/way-dashes-clamp/style.mapcss   |    20 +
 test/data/renderer/way-dashes/data.osm             |   135 +-
 test/data/renderer/way-dashes/reference.png        |   Bin 5945 -> 4889 bytes
 test/data/renderer/way-repeat-image-clamp/data.osm |   165 +
 .../renderer/way-repeat-image-clamp/reference.png  |   Bin 0 -> 43650 bytes
 .../renderer/way-repeat-image-clamp/style.mapcss   |    22 +
 .../data/renderer/way-repeat-image-clamp/trees.svg |   378 +
 test/data/renderer/way-text/data.osm               |    97 +
 test/data/renderer/way-text/reference.png          |   Bin 0 -> 21086 bytes
 test/data/renderer/way-text/style.mapcss           |    49 +
 .../josm/gui/mappaint/MapCSSRendererTest.java      |     9 +-
 .../josm/actions/CombineWayActionTest.java         |     4 +-
 .../josm/actions/mapmode/DrawActionTest.java       |     4 +-
 .../josm/actions/mapmode/SelectActionTest.java     |    12 +-
 .../josm/actions/search/SearchCompilerTest.java    |   198 +
 .../openstreetmap/josm/data/osm/DataSetTest.java   |    36 +
 .../openstreetmap/josm/data/osm/NodeGraphTest.java |    79 +
 .../preferences/map/MapPaintPreferenceTestIT.java  |     7 +-
 .../josm/io/remotecontrol/DNSNameFixTest.java      |    33 -
 tools/pmd/josm-ruleset.xml                         |    50 +-
 290 files changed, 36132 insertions(+), 4322 deletions(-)

diff --cc debian/changelog
index 3f46a1f,879e5a3..66ce2e6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+ josm (0.0.svn12542+dfsg-1) unstable; urgency=medium
+ 
+   * New tested snapshot.
+   * Refresh patches.
+   * Drop license & copyright for DNSNameFix.java, removed upstream.
+   * Bump minimum required jmapviewer version to 2.3.
+   * Add upstream patch to fix AppSteam metadata.
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Sun, 30 Jul 2017 22:58:36 +0200
+ 
 +josm (0.0.svn12450+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Bas Couwenberg <sebas...@debian.org>  Sat, 08 Jul 2017 10:59:28 +0200
 +
  josm (0.0.svn12450+dfsg-1) unstable; urgency=medium
  
    * New hotfix tested snapshot.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to