[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. debian/0.0.svn21666-2-8-g14efaba

[David Paleino]

The following commit has been merged in the master branch:
commit eb8665785febb13ffb18897aee730e12c3f04f1a
Author: David Paleino <dapal at debian.org>
Date:   Sun Jul 18 21:06:41 2010 +0200

    debian/control: use Breaks instead of Conflicts

diff --git a/debian/changelog b/debian/changelog
index 0f9c5d0..b147fa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ josm-plugins (0.0.svn22363-1) UNRELEASED; urgency=low
     upstream
   * debian/control:
     - update dependencies on JOSM
-    - update Standards-Version to 3.9.0, no changes needed
+    - update Standards-Version to 3.9.0
+      + use Breaks instead of Conflicts
 
- -- David Paleino <dapal at debian.org>  Sun, 18 Jul 2010 17:38:16 +0200
+ -- David Paleino <dapal at debian.org>  Sun, 18 Jul 2010 21:16:01 +0200
 
 josm-plugins (0.0.svn21666-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a495e21..e442918 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Depends:
  , libmetadata-extractor-java
  , liblog4j1.2-java
  , libjgrapht0.8-java
-Conflicts: josm (>= 0.0.svn3377)
+Breaks: josm (>= 0.0.svn3377)
 Suggests: gpsd
 Description: Plugins for JOSM
  JOSM (Java OpenStreetMap) plugin collection.

-- 
Plugins for josm