[josm] 01/01: Add josm-plugins to Conflicts, as it Breaks newer josm revisions.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository josm.

commit 5e5097a977148098ee116f2e8e548155259e5574
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 17 23:46:58 2017 +0100

    Add josm-plugins to Conflicts, as it Breaks newer josm revisions.
---
 debian/changelog | 1 +
 debian/control   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bb6f261..16230b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn11639+dfsg-1~exp2) UNRELEASED; urgency=medium
 
   * Drop josm-plugins from Recommends, package will be removed.
     See also: https://josm.openstreetmap.de/ticket/7483
+  * Add josm-plugins to Conflicts, as it Breaks newer josm revisions.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 17 Mar 2017 23:28:07 +0100
 
diff --git a/debian/control b/debian/control
index da6e29f..eadf002 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,7 @@ Depends: default-jre (>= 2:1.8) | java8-runtime,
          ${misc:Depends}
 Recommends: josm-l10n,
             webkit-image-gtk | webkit-image-qt
+Conflicts: josm-plugins
 Description: Editor for OpenStreetMap
  JOSM is an editor for OpenStreetMap (OSM) written in Java.
  The current version supports stand alone GPX tracks, GPX track data

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