[josm-plugins] 01/02: Merge tag 'debian/0.0.svn32641+ds-1' into jessie-backports

[Bas Couwenberg]

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

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

commit b83fe927579352b1df0a4e06e81dde9b48faccc5
Merge: d86a442 3737a1b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 17 19:23:32 2016 +0200

    Merge tag 'debian/0.0.svn32641+ds-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 DirectUpload/.project                              |   5 +
 DirectUpload/build.xml                             |   2 +-
 .../plugins/DirectUpload/UploadOsmConnection.java  |  12 +-
 build-common.xml                                   | 112 +++++++++----
 colorscheme/.project                               |   5 +
 debian/changelog                                   |   8 +
 debian/control                                     |   8 +-
 debian/patches/00-fix_build-common.patch           |  10 +-
 debian/patches/150_routing.diff                    |   2 +-
 editgpx/.settings/org.eclipse.jdt.core.prefs       |   1 +
 editgpx/.settings/org.eclipse.jdt.ui.prefs         |  10 +-
 editgpx/build.xml                                  |   2 +-
 .../josm/plugins/editgpx/EditGpxLayer.java         |  45 +++---
 .../josm/plugins/editgpx/EditGpxMode.java          |  63 ++++----
 .../josm/plugins/editgpx/EditGpxPlugin.java        |  26 +---
 .../josm/plugins/editgpx/GPXLayerImportAction.java |  11 +-
 lakewalker/.project                                |   5 +
 lakewalker/build.xml                               |   2 +-
 .../josm/plugins/lakewalker/LakewalkerAction.java  |   2 +-
 measurement/.settings/org.eclipse.jdt.ui.prefs     |  60 +++++++
 measurement/build.xml                              |   2 +-
 .../plugins/measurement/MeasurementDialog.java     |   8 +-
 .../josm/plugins/measurement/MeasurementLayer.java |   2 +-
 .../plugins/measurement/MeasurementPlugin.java     |  41 +++--
 openvisible/.project                               |   5 +
 openvisible/build.xml                              | 173 ++-------------------
 .../josm/plugin/openvisible/OpenVisibleAction.java |   6 +-
 routing/.project                                   |   5 +
 routing/.settings/org.eclipse.jdt.ui.prefs         |  60 +++++++
 routing/build.xml                                  |   2 +-
 .../com/innovant/josm/jrt/core/RoutingGraph.java   |   4 +-
 .../innovant/josm/plugin/routing/RoutingLayer.java |   2 +-
 .../josm/plugin/routing/RoutingPlugin.java         |  31 ++--
 .../plugin/routing/actions/AddRouteNodeAction.java |   4 +-
 .../routing/actions/MoveRouteNodeAction.java       |   8 +-
 .../routing/actions/RemoveRouteNodeAction.java     |   4 +-
 .../josm/plugin/routing/gui/RoutingDialog.java     |   4 +-
 .../josm/plugin/routing/gui/RoutingMenu.java       |  20 +--
 svn-info.xml                                       |  10 +-
 39 files changed, 438 insertions(+), 344 deletions(-)

diff --cc debian/changelog
index 0a5837b,5cb23d4..ef09184
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
+ josm-plugins (0.0.svn32641+ds-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Bump JOSM dependency to 10526.
+   * Refresh patches.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 12 Jul 2016 13:11:07 +0200
+ 
 +josm-plugins (0.0.svn32221+ds-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 19 Jun 2016 21:48:21 +0200
 +
  josm-plugins (0.0.svn32221+ds-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index c11644b,94f5231..785ba5b
--- a/debian/control
+++ b/debian/control
@@@ -16,10 -16,10 +16,10 @@@ Build-Depends: debhelper (>= 9)
                 liblog4j1.2-java,
                 libmetadata-extractor-java,
                 python
- Build-Conflicts: josm (>= 0.0.svn10328)
+ Build-Conflicts: josm (>= 0.0.svn10527)
  Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/josm-plugins.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/josm-plugins.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/josm-plugins.git -b jessie-backports
  Homepage: https://josm.openstreetmap.de/wiki/Plugins
  
  Package: josm-plugins

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