[josm-plugins] 01/02: Merge tag 'debian/0.0.svn33050+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 7e032ecb32751739d334d3376ce40dec7f56f4c9
Merge: 74c358a a97100e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Nov 11 21:18:52 2016 +0100

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

 build-common.xml                                         |  5 +++--
 debian/changelog                                         |  8 ++++++++
 debian/control                                           |  8 ++++----
 debian/patches/00-fix_build-common.patch                 |  4 ++--
 .../josm/plugins/lakewalker/LakewalkerAction.java        | 16 ++++++----------
 .../josm/plugins/measurement/MeasurementDialog.java      |  4 ++--
 svn-info.xml                                             |  8 ++++----
 7 files changed, 29 insertions(+), 24 deletions(-)

diff --cc debian/changelog
index b74a88e,90be4c2..0b3a4a9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ josm-plugins (0.0.svn33050+ds-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Bump JOSM dependency to 11223.
+   * Refresh patches.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 07 Nov 2016 08:06:48 +0100
+ 
 +josm-plugins (0.0.svn32928+ds-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 12 Sep 2016 10:33:43 +0200
 +
  josm-plugins (0.0.svn32928+ds-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index 5136320,df38220..a236698
--- a/debian/control
+++ b/debian/control
@@@ -15,10 -15,10 +15,10 @@@ Build-Depends: debhelper (>= 9)
                 liblog4j1.2-java,
                 libmetadata-extractor-java,
                 python
- Build-Conflicts: josm (>= 0.0.svn10967)
+ Build-Conflicts: josm (>= 0.0.svn11224)
  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