[josm-plugins] 01/02: Merge tag 'debian/0.0.svn32928+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 5cf03345ce7632e80e0c9d57f757ba946d2af4e1
Merge: 5e93877 4345f57
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 12 10:33:39 2016 +0200

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

 build-common.xml                                   | 27 +++++++++++-----------
 debian/ant.properties                              |  4 ++--
 debian/changelog                                   | 11 +++++++++
 debian/control                                     | 12 ++++------
 debian/patches/00-fix_build-common.patch           | 13 ++++-------
 lakewalker/.settings/org.eclipse.jdt.ui.prefs      |  9 ++++++--
 .../josm/plugins/lakewalker/BooleanConfigurer.java |  1 +
 .../josm/plugins/lakewalker/DoubleConfigurer.java  |  2 +-
 .../josm/plugins/lakewalker/LakewalkerAction.java  | 12 ++++++----
 .../plugins/lakewalker/LakewalkerPreferences.java  |  4 ++++
 .../plugins/lakewalker/StringEnumConfigurer.java   |  1 +
 svn-info.xml                                       |  8 +++----
 12 files changed, 61 insertions(+), 43 deletions(-)

diff --cc debian/changelog
index 8b0ee48,951048c..a794f22
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,21 @@@
+ josm-plugins (0.0.svn32928+ds-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Drop Debian OpenStreetMap Team from Uploaders.
+   * Include epoch in default-jdk version requirement.
+   * Refresh patches.
+   * Bump JOSM dependency to 10966.
+   * Update ant.properties to use 1.8 source & target.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 06 Sep 2016 10:35:43 +0200
+ 
 +josm-plugins (0.0.svn32805+ds-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Use OpenJDK 8 for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 18 Aug 2016 10:56:21 +0200
 +
  josm-plugins (0.0.svn32805+ds-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index 568a310,18ebdb3..5136320
--- a/debian/control
+++ b/debian/control
@@@ -17,10 -15,10 +15,10 @@@ Build-Depends: debhelper (>= 9)
                 liblog4j1.2-java,
                 libmetadata-extractor-java,
                 python
- Build-Conflicts: josm (>= 0.0.svn10787)
+ Build-Conflicts: josm (>= 0.0.svn10967)
  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