[josm-plugins] 177/369: Merge branch 'master' into dh7

Bas Couwenberg sebastic at xs4all.nl
Sat Oct 18 12:03:40 UTC 2014


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

sebastic-guest pushed a commit to branch master
in repository josm-plugins.

commit 44005c607f46d8d48a8d828e02505a8f321e9d0c
Merge: 604fb92 e0c33cd
Author: David Paleino <dapal at debian.org>
Date:   Sun Oct 10 22:01:16 2010 +0200

    Merge branch 'master' into dh7
    
    Conflicts:
    	debian/changelog

 .../josm/plugins/DirectUpload/UploadDataGui.java   |  104 +-
 .../plugins/DirectUpload/UploadDataGuiPlugin.java  |   14 +-
 cadastre-fr/src/cadastre_fr/CacheControl.java      |   10 +-
 cadastre-fr/src/cadastre_fr/CadastreGrabber.java   |   10 +-
 cadastre-fr/src/cadastre_fr/CadastreInterface.java |   20 +-
 cadastre-fr/src/cadastre_fr/CadastrePlugin.java    |   28 +-
 .../src/cadastre_fr/CadastrePreferenceSetting.java |   34 +-
 .../src/cadastre_fr/CheckSourceUploadHook.java     |    2 +-
 .../src/cadastre_fr/DownloadSVGBuilding.java       |    2 +-
 cadastre-fr/src/cadastre_fr/DownloadSVGTask.java   |    2 +-
 .../src/cadastre_fr/DownloadWMSVectorImage.java    |    4 +-
 cadastre-fr/src/cadastre_fr/EastNorthBound.java    |    2 +-
 cadastre-fr/src/cadastre_fr/GeorefImage.java       |   20 +-
 cadastre-fr/src/cadastre_fr/ImageModifier.java     |   24 +-
 .../src/cadastre_fr/MenuActionGrabPlanImage.java   |  116 +-
 .../src/cadastre_fr/MenuActionLoadFromCache.java   |    2 +-
 .../src/cadastre_fr/MenuActionNewLocation.java     |   26 +-
 cadastre-fr/src/cadastre_fr/WMSLayer.java          |    4 +-
 .../josm/plugin/colorscheme/ColorSchemePlugin.java |    2 +-
 debian/changelog                                   |    5 +-
 .../josm/plugins/editgpx/EditGpxLayer.java         |  260 ++--
 .../josm/plugins/editgpx/EditGpxMode.java          |  296 ++--
 .../josm/plugins/editgpx/EditGpxPlugin.java        |   56 +-
 .../josm/plugins/editgpx/GPXLayerImportAction.java |  170 +--
 .../josm/plugins/editgpx/data/EditGpxData.java     |   96 +-
 .../josm/plugins/editgpx/data/EditGpxTrack.java    |   82 +-
 .../plugins/editgpx/data/EditGpxTrackSegment.java  |   64 +-
 .../josm/plugins/editgpx/data/EditGpxWayPoint.java |   58 +-
 .../josm/plugins/lakewalker/BooleanConfigurer.java |  110 +-
 .../josm/plugins/lakewalker/Configurer.java        |    4 +-
 .../josm/plugins/lakewalker/DoubleConfigurer.java  |    6 +-
 .../josm/plugins/lakewalker/IntConfigurer.java     |   88 +-
 .../josm/plugins/lakewalker/Lakewalker.java        |  186 +--
 .../josm/plugins/lakewalker/LakewalkerAction.java  |    8 +-
 .../plugins/lakewalker/LakewalkerException.java    |    2 +-
 .../josm/plugins/lakewalker/LakewalkerPlugin.java  |   18 +-
 .../josm/plugins/lakewalker/LakewalkerWMS.java     |  220 +--
 .../josm/plugins/lakewalker/StringConfigurer.java  |    2 +-
 .../plugins/lakewalker/StringEnumConfigurer.java   |    8 +-
 livegps/src/livegps/AppendableGpxTrackSegment.java |   90 +-
 livegps/src/livegps/ILiveGpsSuppressor.java        |   20 +-
 livegps/src/livegps/LiveGpsAcquirer.java           |  618 ++++----
 livegps/src/livegps/LiveGpsLayer.java              |  316 ++---
 livegps/src/livegps/LiveGpsPlugin.java             |  468 +++---
 livegps/src/livegps/LiveGpsSuppressor.java         |  230 +--
 livegps/src/livegps/SingleSegmentGpxTrack.java     |   44 +-
 livegps/src/org/json/JSONArray.java                |   28 +-
 livegps/src/org/json/JSONException.java            |    8 +-
 livegps/src/org/json/JSONObject.java               |  102 +-
 livegps/src/org/json/JSONString.java               |   14 +-
 livegps/src/org/json/JSONTokener.java              |   74 +-
 measurement/.classpath                             |    1 +
 measurement/josm-measurement.launch                |   12 +
 .../plugins/measurement/MeasurementPlugin.java     |    6 +-
 .../josm/plugin/openvisible/OpenVisibleAction.java |    4 +-
 .../josm/plugins/remotecontrol/PermissionPref.java |   22 +-
 .../remotecontrol/PermissionPrefWithDefault.java   |   20 +-
 .../plugins/remotecontrol/RemoteControlPlugin.java |   62 +-
 .../josm/plugins/remotecontrol/RequestHandler.java |  184 +--
 .../RequestHandlerForbiddenException.java          |    2 +-
 .../plugins/remotecontrol/RequestProcessor.java    |  528 +++----
 .../remotecontrol/handler/AddNodeHandler.java      |   46 +-
 .../remotecontrol/handler/ImportHandler.java       |   48 +-
 .../remotecontrol/handler/LoadAndZoomHandler.java  |  254 ++--
 .../remotecontrol/handler/VersionHandler.java      |   44 +-
 .../com/innovant/josm/jrt/core/EdgeIterator.java   |    2 +-
 .../com/innovant/josm/jrt/core/RoutingEdge.java    |   10 +-
 .../josm/jrt/core/RoutingGraphDelegator.java       |   12 +-
 routing/src/com/innovant/josm/jrt/osm/OsmEdge.java |    2 +-
 .../josm/plugins/slippymap/SlippyMapKey.java       |  126 +-
 .../josm/plugins/slippymap/SlippyMapLayer.java     |    8 +-
 .../josm/plugins/slippymap/SlippyMapPlugin.java    |   36 +-
 .../slippymap/SlippyMapPreferenceSetting.java      |   10 +-
 .../plugins/slippymap/SlippyMapPreferences.java    |  108 +-
 svn-info.xml                                       |    8 +-
 wmsplugin/build.xml                                |    3 +-
 wmsplugin/sources.cfg                              |    3 +
 wmsplugin/src/wmsplugin/AddWMSLayerPanel.java      |  909 ++++++------
 wmsplugin/src/wmsplugin/GeorefImage.java           |  400 +++---
 wmsplugin/src/wmsplugin/Grabber.java               |  204 +--
 wmsplugin/src/wmsplugin/HTMLGrabber.java           |   59 +-
 .../src/wmsplugin/Map_Rectifier_WMSmenuAction.java |  421 +++---
 wmsplugin/src/wmsplugin/WMSAdjustAction.java       |  366 ++---
 wmsplugin/src/wmsplugin/WMSDownloadAction.java     |   33 +-
 wmsplugin/src/wmsplugin/WMSGrabber.java            |  332 ++---
 wmsplugin/src/wmsplugin/WMSInfo.java               |  113 +-
 wmsplugin/src/wmsplugin/WMSLayer.java              | 1497 ++++++++++----------
 wmsplugin/src/wmsplugin/WMSLayerInfo.java          |  156 ++
 wmsplugin/src/wmsplugin/WMSPlugin.java             |  618 ++++----
 wmsplugin/src/wmsplugin/WMSPreferenceEditor.java   |  319 +++--
 wmsplugin/src/wmsplugin/WMSRemoteHandler.java      |  168 ++-
 wmsplugin/src/wmsplugin/WMSRequest.java            |  186 +--
 wmsplugin/src/wmsplugin/io/WMSLayerExporter.java   |    8 +-
 wmsplugin/src/wmsplugin/io/WMSLayerImporter.java   |    8 +-
 94 files changed, 5877 insertions(+), 5658 deletions(-)

diff --cc debian/changelog
index dc87bbd,6a99760..770dcae
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,13 @@@
- josm-plugins (0.0.svn23040-2) UNRELEASED; urgency=low
+ josm-plugins (0.0.svn23479-1) UNRELEASED; urgency=low
  
+   * New upstream snapshot
    * debian/control:
      - added two new packages: webkit-image-qt and webkit-image-gtk
 +    - bump debhelper dependency to >= 8~
 +  * debian/rules rewritten to use dh7
 +  * debian/compat bumped to 8
  
-  -- David Paleino <dapal at debian.org>  Sun, 10 Oct 2010 21:48:51 +0200
+  -- David Paleino <dapal at debian.org>  Sun, 10 Oct 2010 22:00:30 +0200
  
  josm-plugins (0.0.svn23040-1) unstable; urgency=low
  

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



More information about the Pkg-grass-devel mailing list