[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn28784+ds1-1-18-g78b536c

[David Paleino]

The following commit has been merged in the master branch:
commit 81e2d688312c1d15652671f3bcd4b15327e1cd7a
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 13 20:15:10 2012 +0100

    Updated debian/control: included plugins in long description; version of JOSM in Breaks (>= 5577)

diff --git a/debian/changelog b/debian/changelog
index f40c42a..4e20ae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ josm-plugins (0.0.svn28937+ds1-1) UNRELEASED; urgency=low
     under the problematic JSON license. Also removed surveyor plugin,
     which depends on it. (Closes: #692620)
   * Updated debian/copyright.
+  * Updated debian/control:
+    - included plugins in long description
+    - version of JOSM in Breaks (>= 5577)
 
- -- David Paleino <dapal at debian.org>  Tue, 13 Nov 2012 20:11:54 +0100
+ -- David Paleino <dapal at debian.org>  Tue, 13 Nov 2012 20:14:15 +0100
 
 josm-plugins (0.0.svn28784+ds1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 90907c9..a528bbc 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  , libjgrapht0.8-java
  , libgettext-ant-tasks-java
  , python
-Build-Conflicts: josm (>= 0.0.svn5532)
+Build-Conflicts: josm (>= 0.0.svn5577)
 Standards-Version: 3.9.4
 Homepage: http://josm.openstreetmap.de/wiki/Plugins
 Vcs-Git: git://git.debian.org/pkg-osm/josm-plugins.git
@@ -31,19 +31,17 @@ Depends:
  , libmetadata-extractor-java
  , liblog4j1.2-java
  , libjgrapht0.8-java
-Breaks: josm (>= 0.0.svn5532)
+Breaks: josm (>= 0.0.svn5577)
 Suggests: gpsd
 Description: Plugins for JOSM
  JOSM (Java OpenStreetMap) plugin collection.
  .
  This package contains the following plugins:
   * colorscheme        - Allows creating different color schemes.
-  * livegps            - Supports live GPS input together with gpsd.
   * measurement        - Adds a dialog and a layer to measure length 
                          and angle of segments and create measurement paths.
   * openvisible        - Allows opening gpx and osm files that intersect
                          the currently visible screen area.
-  * surveyor           - Allows adding markers/nodes on current gps positions.
   * cadastre-fr        - A special handler for the French land registry WMS
                          server.
   * DirectUpload       - Directly uploads GPS Traces from current active

-- 
Plugins for JOSM