[josm-plugins] 01/02: Merge tag 'debian/0.0.svn32805+ds-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Thu Aug 18 09:26:28 UTC 2016
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 81faf57d29b6eae578a776a1f874220e949b0641
Merge: 7c4ad90 1c61297
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Aug 18 10:56:16 2016 +0200
Merge tag 'debian/0.0.svn32805+ds-1' into jessie-backports
Conflicts:
debian/changelog
DirectUpload/.classpath | 2 +-
DirectUpload/.settings/org.eclipse.jdt.core.prefs | 6 +-
DirectUpload/build.xml | 2 +-
build-common.xml | 22 ++-
colorscheme/.classpath | 2 +-
colorscheme/.settings/org.eclipse.jdt.core.prefs | 6 +-
colorscheme/build.xml | 2 +-
debian/changelog | 10 ++
debian/control | 10 +-
debian/patches/00-fix_build-common.patch | 34 +++-
debian/patches/150_routing.diff | 2 +-
editgpx/.classpath | 2 +-
editgpx/.settings/org.eclipse.jdt.core.prefs | 6 +-
editgpx/build.xml | 2 +-
lakewalker/.checkstyle | 18 ++
lakewalker/.classpath | 2 +-
lakewalker/.project | 6 +
lakewalker/.settings/org.eclipse.jdt.core.prefs | 6 +-
lakewalker/build.xml | 2 +-
lakewalker/nbproject/project.xml | 2 +-
.../josm/plugins/lakewalker/BooleanConfigurer.java | 27 +--
.../josm/plugins/lakewalker/Configurer.java | 19 +-
.../josm/plugins/lakewalker/DoubleConfigurer.java | 22 +--
.../josm/plugins/lakewalker/IntConfigurer.java | 27 +--
.../josm/plugins/lakewalker/Lakewalker.java | 195 ++++++++++-----------
.../josm/plugins/lakewalker/LakewalkerAction.java | 46 ++---
.../plugins/lakewalker/LakewalkerException.java | 5 +-
.../josm/plugins/lakewalker/LakewalkerPlugin.java | 3 +-
.../plugins/lakewalker/LakewalkerPreferences.java | 5 +-
.../josm/plugins/lakewalker/LakewalkerWMS.java | 83 ++++-----
.../josm/plugins/lakewalker/StringConfigurer.java | 22 +--
.../plugins/lakewalker/StringEnumConfigurer.java | 46 ++---
measurement/.classpath | 2 +-
measurement/.settings/org.eclipse.jdt.core.prefs | 6 +-
measurement/build.xml | 2 +-
.../plugins/measurement/MeasurementDialog.java | 10 +-
openvisible/.classpath | 2 +-
openvisible/.settings/org.eclipse.jdt.core.prefs | 6 +-
openvisible/build.xml | 2 +-
openvisible/nbproject/project.xml | 2 +-
routing/.checkstyle | 18 ++
routing/.classpath | 2 +-
routing/.project | 6 +
routing/.settings/org.eclipse.jdt.core.prefs | 6 +-
routing/build.xml | 2 +-
.../com/innovant/josm/jrt/core/EdgeIterator.java | 5 +-
.../com/innovant/josm/jrt/core/RoutingEdge.java | 21 +--
.../com/innovant/josm/jrt/core/RoutingGraph.java | 118 +++++--------
.../josm/jrt/core/RoutingGraphDelegator.java | 13 +-
.../com/innovant/josm/jrt/core/RoutingProfile.java | 18 +-
.../innovant/josm/jrt/gtfs/GTFSTransportModes.java | 7 +-
routing/src/com/innovant/josm/jrt/osm/OsmEdge.java | 132 ++++++--------
.../src/com/innovant/josm/jrt/osm/OsmWayTypes.java | 88 ++++------
.../innovant/josm/plugin/routing/RoutingLayer.java | 147 +++++++---------
.../innovant/josm/plugin/routing/RoutingModel.java | 63 ++-----
.../josm/plugin/routing/RoutingPlugin.java | 36 +---
.../plugin/routing/actions/AddRouteNodeAction.java | 35 +---
.../routing/actions/MoveRouteNodeAction.java | 45 +----
.../routing/actions/RemoveRouteNodeAction.java | 32 +---
.../josm/plugin/routing/gui/RoutingDialog.java | 34 +---
.../josm/plugin/routing/gui/RoutingMenu.java | 48 ++---
.../routing/gui/RoutingPreferenceDialog.java | 52 ++----
svn-info.xml | 10 +-
63 files changed, 640 insertions(+), 974 deletions(-)
diff --cc debian/changelog
index 79bae09,89ec9ce..a576bbc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+ josm-plugins (0.0.svn32805+ds-1) unstable; urgency=medium
+
+ * New upstream SVN snapshot.
+ - switch to Java 8
+ * Update JDK dependency to require at least version 1.8.
+ * Bump JOSM dependency to 10786.
+ * Refresh patches.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 12 Aug 2016 15:31:12 +0200
+
+josm-plugins (0.0.svn32641+ds-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 17 Jul 2016 19:23:44 +0200
+
josm-plugins (0.0.svn32641+ds-1) unstable; urgency=medium
* New upstream SVN snapshot.
diff --cc debian/control
index 785ba5b,770dedf..80b3be2
--- 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.svn10527)
+ Build-Conflicts: josm (>= 0.0.svn10787)
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
More information about the Pkg-grass-devel
mailing list