[josm-plugins] 01/02: Merge tag 'debian/0.0.svn33112+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 1358651dfa8facf4008b8bded6a9f24af12617fa
Merge: 1e67530 d4606bb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 18 07:57:23 2017 +0100

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

 build-common.xml                         |  8 +++++---
 debian/changelog                         |  8 ++++++++
 debian/control                           |  8 ++++----
 debian/patches/00-fix_build-common.patch |  9 +++++----
 svn-info.xml                             | 10 +++++-----
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index 0dfad32,0b77109..56fccee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ josm-plugins (0.0.svn33112+ds-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Bump JOSM dependency to 11427.
+   * Refresh patches.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 07 Jan 2017 23:34:27 +0100
+ 
 +josm-plugins (0.0.svn33050+ds-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 11 Nov 2016 21:18:55 +0100
 +
  josm-plugins (0.0.svn33050+ds-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index a236698,0f4251f..f5074e7
--- 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.svn11224)
+ Build-Conflicts: josm (>= 0.0.svn11428)
  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